Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/model/SysUser.java

@@ -220,10 +220,10 @@ public class SysUser extends BaseEntity {
         if (user.getStatus() == 0) {
             throw new SystemException("账号已被锁定,请联系管理员");
         }
-//        // 新注册用户需要审核
-//        if (user.getStatus() == 2) {
-//            throw new SystemException("新注册用户需要审核,请联系管理员");
-//        }
+        // 新注册用户需要审核
+        if (user.getStatus() == 2) {
+            throw new SystemException("新注册用户需要审核,请联系管理员");
+        }
         // 新注册用户审核不通过
         if (user.getStatus() == 3) {
             throw new SystemException("新注册用户审核不通过,请联系管理员");

src/main/java/com/ydtech/modules/admin/model/dto/QuTeamNumDto.java

@@ -31,11 +31,11 @@ public class QuTeamNumDto {
 
     @ApiModelProperty(value = "创建时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate createTimeStart;
+    private String createTimeStart;
 
     @ApiModelProperty(value = "创建时间结束")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate createTimeEnd;
+    private String createTimeEnd;
 
 
     @TableField(exist = false)

src/main/java/com/ydtech/modules/admin/model/dto/QuUserNumDto.java

@@ -20,11 +20,11 @@ public class QuUserNumDto {
 
     @ApiModelProperty(value = "创建时间开始")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate createTimeStart;
+    private String createTimeStart;
 
     @ApiModelProperty(value = "创建时间结束")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private LocalDate createTimeEnd;
+    private String createTimeEnd;
 
     @ApiModelProperty(value = "省市区")
     private String areaCode;

src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -1178,6 +1178,13 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
         Page<ExportExpenditureTypeDetalsDto> page = new Page<>(myInsuranceQueryDto.getPageNum(),
                 myInsuranceQueryDto.getPageSize());
         List<String> userList = getStrings(myInsuranceQueryDto);
+        //赋值开始和结束时间
+        if(StringUtils.isNotBlank(myInsuranceQueryDto.getStartDate())){
+            myInsuranceQueryDto.setStartDate(myInsuranceQueryDto.getStartDate()+" 00:00:00");
+        }
+        if(StringUtils.isNotBlank(myInsuranceQueryDto.getEndDate())){
+            myInsuranceQueryDto.setEndDate(myInsuranceQueryDto.getEndDate()+" 23:59:59");
+        }
         Page<ExportExpenditureTypeDetalsDto> pageList=insFeeOrderNewService.findMyInsuranceByUserId(page,myInsuranceQueryDto,userList);
 
         BasePageResult<ExportExpenditureTypeDetalsDto> result = new BasePageResult<>(myInsuranceQueryDto.getPageNum(), myInsuranceQueryDto.getPageSize(), pageList.getTotal(),
@@ -1215,6 +1222,13 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     public BasePageResult<ExportExpenditureTypeDetalsTGDto> findMyInsuranceTGByUserId(MyInsuranceTgQueryDto myInsuranceTgQueryDto) {
         Page<ExportExpenditureTypeDetalsTGDto> page = new Page<>(myInsuranceTgQueryDto.getPageNum(),
                 myInsuranceTgQueryDto.getPageSize());
+        //赋值开始和结束时间
+        if(StringUtils.isNotBlank(myInsuranceTgQueryDto.getStartDate())){
+            myInsuranceTgQueryDto.setStartDate(myInsuranceTgQueryDto.getStartDate()+" 00:00:00");
+        }
+        if(StringUtils.isNotBlank(myInsuranceTgQueryDto.getEndDate())){
+            myInsuranceTgQueryDto.setEndDate(myInsuranceTgQueryDto.getEndDate()+" 23:59:59");
+        }
         Page<ExportExpenditureTypeDetalsTGDto> pageList=insFeeOrderNewService.findMyInsuranceTGByUserId(page,myInsuranceTgQueryDto);
         BasePageResult<ExportExpenditureTypeDetalsTGDto> result = new BasePageResult<>(myInsuranceTgQueryDto.getPageNum(), myInsuranceTgQueryDto.getPageSize(), pageList.getTotal(),
                 pageList.getPages()
@@ -1230,6 +1244,13 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
     @Override
     public List<ExportExpenditureTypeDetalsDto> exportMyInsuranceByUserId(MyInsuranceQueryDto myInsuranceQueryDto) {
         List<String> userList = getStrings(myInsuranceQueryDto);
+        //赋值开始和结束时间
+        if(StringUtils.isNotBlank(myInsuranceQueryDto.getStartDate())){
+            myInsuranceQueryDto.setStartDate(myInsuranceQueryDto.getStartDate()+" 00:00:00");
+        }
+        if(StringUtils.isNotBlank(myInsuranceQueryDto.getEndDate())){
+            myInsuranceQueryDto.setEndDate(myInsuranceQueryDto.getEndDate()+" 23:59:59");
+        }
         return insFeeOrderNewService.exportMyInsuranceByUserId(myInsuranceQueryDto,userList);
     }
     /**
@@ -1240,6 +1261,13 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
      */
     @Override
     public List<ExportExpenditureTypeDetalsTGDto> exportMyInsuranceTGByUserId(MyInsuranceTgQueryDto myInsuranceTgQueryDto) {
+        //赋值开始和结束时间
+        if(StringUtils.isNotBlank(myInsuranceTgQueryDto.getStartDate())){
+            myInsuranceTgQueryDto.setStartDate(myInsuranceTgQueryDto.getStartDate()+" 00:00:00");
+        }
+        if(StringUtils.isNotBlank(myInsuranceTgQueryDto.getEndDate())){
+            myInsuranceTgQueryDto.setEndDate(myInsuranceTgQueryDto.getEndDate()+" 23:59:59");
+        }
         return insFeeOrderNewService.exportMyInsuranceTGByUserId(myInsuranceTgQueryDto);
     }
     /**
@@ -1401,6 +1429,13 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
      */
     @Override
     public MySumAmountDto findMyAmount(MySumAmountQueryDto mySumAmountQueryDto) {
+        //赋值开始和结束时间
+        if(StringUtils.isNotBlank(mySumAmountQueryDto.getStartDate())){
+            mySumAmountQueryDto.setStartDate(mySumAmountQueryDto.getStartDate()+" 00:00:00");
+        }
+        if(StringUtils.isNotBlank(mySumAmountQueryDto.getEndDate())){
+            mySumAmountQueryDto.setEndDate(mySumAmountQueryDto.getEndDate()+" 23:59:59");
+        }
         //查询预收和实收的总金额
         mySumAmountQueryDto.setAuditstatus("0");
         BigDecimal ysAmount= insFeeOrderNewService.findMyAmountYSOrSSCXAmount(mySumAmountQueryDto);

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -128,6 +128,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public IPage<QuTeamNum> quTeamNum(QuTeamNumDto quTeamNumDto) {
+
+        if (StringUtils.isNotEmpty(quTeamNumDto.getCreateTimeStart()) && StringUtils.isNotEmpty(quTeamNumDto.getCreateTimeEnd())) {
+            quTeamNumDto.setCreateTimeStart(quTeamNumDto.getCreateTimeStart() + " 00:00:00");
+            quTeamNumDto.setCreateTimeEnd(quTeamNumDto.getCreateTimeEnd() + " 23:59:59");
+        }
+
         //判断必传标识是否为空
         if (quTeamNumDto.getTeamOrUserFlag() == null) {
             throw new SystemException("必传参数未传");
@@ -848,6 +854,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public IPage<QuUserNum> quUserNum(QuUserNumDto quUserNumDto) {
 
+        if (StringUtils.isNotEmpty(quUserNumDto.getCreateTimeStart()) && StringUtils.isNotEmpty(quUserNumDto.getCreateTimeEnd())) {
+            quUserNumDto.setCreateTimeStart(quUserNumDto.getCreateTimeStart() + " 00:00:00");
+            quUserNumDto.setCreateTimeEnd(quUserNumDto.getCreateTimeEnd() + " 23:59:59");
+        }
+
         //获取所有用户
         List<SysUser> users = list();
 
@@ -941,7 +952,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                         quUserNum.setMainAcceptInsuranceSum(mainAcceptInsuranceSum.getMainAcceptInsuranceSum());
                     }
                 }
-                if (quUserNum.getAreaName() != null){
+                if (quUserNum.getAreaName() != null) {
                     quUserNums.add(quUserNum);
                 }
 //                quUserNums.add(quUserNum);
@@ -975,6 +986,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      */
     @Override
     public IPage<QuUserNum> getQuUserByCompany(QuUserNumDto quUserNumDto) {
+        if (StringUtils.isNotEmpty(quUserNumDto.getCreateTimeStart()) && StringUtils.isNotEmpty(quUserNumDto.getCreateTimeEnd())) {
+            quUserNumDto.setCreateTimeStart(quUserNumDto.getCreateTimeStart() + " 00:00:00");
+            quUserNumDto.setCreateTimeEnd(quUserNumDto.getCreateTimeEnd() + " 23:59:59");
+        }
 
         //查询单个用户的详情时不需要区域code
         if (!quUserNumDto.getQuMarks().equals(QuMarks.USER_COMPANY_MARK.getCode())) {
@@ -1124,6 +1139,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public IPage<QuUserNum> quAgentAreaAdmin(QuUserNumDto quUserNumDto) {
 
+        if (StringUtils.isNotEmpty(quUserNumDto.getCreateTimeStart()) && StringUtils.isNotEmpty(quUserNumDto.getCreateTimeEnd())) {
+            quUserNumDto.setCreateTimeStart(quUserNumDto.getCreateTimeStart() + " 00:00:00");
+            quUserNumDto.setCreateTimeEnd(quUserNumDto.getCreateTimeEnd() + " 23:59:59");
+        }
+
+
         //获取所有代理人用户
         List<SysUserBaseVO> agentUsers = baseMapper.getAgentUserIdsByAreaIds();
 
@@ -1237,6 +1258,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Override
     public IPage<QuUserNum> quAgentAreaAdminDetail(QuUserNumDto quUserNumDto) {
 
+        if (StringUtils.isNotEmpty(quUserNumDto.getCreateTimeStart()) && StringUtils.isNotEmpty(quUserNumDto.getCreateTimeEnd())) {
+            quUserNumDto.setCreateTimeStart(quUserNumDto.getCreateTimeStart() + " 00:00:00");
+            quUserNumDto.setCreateTimeEnd(quUserNumDto.getCreateTimeEnd() + " 23:59:59");
+        }
+
         //查询单个用户的详情时不需要区域code
         if (!quUserNumDto.getQuMarks().equals(QuMarks.USER_COMPANY_MARK.getCode())) {
             //获取所有代理人用户
@@ -1411,13 +1437,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     /**
      * 获取多条用户数据
-     * @param userIds   用户idList
+     *
+     * @param userIds 用户idList
      * @return
      */
     @Override
     public List<SysUser> getByIds(List<String> userIds) {
         LambdaQueryWrapper<SysUser> sysUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        sysUserLambdaQueryWrapper.in(SysUser::getId,userIds);
+        sysUserLambdaQueryWrapper.in(SysUser::getId, userIds);
         return sysUserMapper.selectList(sysUserLambdaQueryWrapper);
     }
 }

src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncome.java

@@ -130,7 +130,7 @@ public class InsPlyIncome implements Serializable {
 
     @ApiModelProperty("记录插入时间")
     @TableField("create_time")
-    private LocalDate createTime;
+    private LocalDateTime createTime;
 
     @ApiModelProperty("开票时间")
     @TableField("invoic_time")
@@ -463,7 +463,7 @@ public class InsPlyIncome implements Serializable {
     private String operationStatus;
 
 
-    public InsPlyIncome(String orderno, String policyno, String syPolicyno, String noPolicyno, String settleno, String deptId, String deptName, String riskcode, LocalDateTime payDate, LocalDateTime signDate, String companyId, String companyName, String agreementId, String licenseno, BigDecimal taxamount, BigDecimal noTaxPremium, BigDecimal commissionFeerate, BigDecimal otherFeerate, BigDecimal commissionFeevalue, BigDecimal otherFeevalue, BigDecimal allFeeValue, BigDecimal finalFeeValue, BigDecimal doingFeeValue, LocalDate createTime, String voucherNumber, String contractId, String contractFileId, String handlingFeesStatus, String documentaryFeesStatus, String isNotCar, String isNotDocumentary) {
+    public InsPlyIncome(String orderno, String policyno, String syPolicyno, String noPolicyno, String settleno, String deptId, String deptName, String riskcode, LocalDateTime payDate, LocalDateTime signDate, String companyId, String companyName, String agreementId, String licenseno, BigDecimal taxamount, BigDecimal noTaxPremium, BigDecimal commissionFeerate, BigDecimal otherFeerate, BigDecimal commissionFeevalue, BigDecimal otherFeevalue, BigDecimal allFeeValue, BigDecimal finalFeeValue, BigDecimal doingFeeValue, LocalDateTime createTime, String voucherNumber, String contractId, String contractFileId, String handlingFeesStatus, String documentaryFeesStatus, String isNotCar, String isNotDocumentary) {
         this.orderno = orderno;
         this.policyno = policyno;
         this.syPolicyno = syPolicyno;

src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncomeLog.java

@@ -121,7 +121,7 @@ public class InsPlyIncomeLog {
 
     @ApiModelProperty("记录插入时间")
     @TableField("create_time")
-    private LocalDate createTime;
+    private LocalDateTime createTime;
 
     @ApiModelProperty("开票时间")
     @TableField("invoic_time")

src/main/java/com/ydtech/modules/fnc/service/impl/InsFeeAuditServiceImpl.java

@@ -414,7 +414,7 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
         insPlyIncome.setLicenseno(order.getLicenseno());
         insPlyIncome.setPayDate(StringUtils.isNullOrEmpty(plyDto.getPayDate()) ? plyDto.getCreatetime() : plyDto.getPayDate());
         insPlyIncome.setSignDate(StringUtils.isNullOrEmpty(plyDto.getInsidePayTime()) ? plyDto.getPayDate() : plyDto.getInsidePayTime());
-        insPlyIncome.setCreateTime(LocalDate.now());
+        insPlyIncome.setCreateTime(LocalDateTime.now());
         if (StringUtils.isNotEmpty(plyDto.getJqpolicyno())) {
             insPlyIncome.setPolicyno(plyDto.getJqpolicyno());
             insPlyIncome.setRiskcode("交强");

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyIncomeServiceImpl.java

@@ -180,7 +180,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         insPlyIncome.setLicenseno(order.getLicenseno());
         insPlyIncome.setTaxamount(insAreaCompany.getTaxamount());
         insPlyIncome.setNoTaxPremium(insFeeOrderNew.getNoNoTaxPremium());
-        insPlyIncome.setCreateTime(LocalDate.now());
+        insPlyIncome.setCreateTime(LocalDateTime.now());
         insPlyIncome.setDocumentaryFeesStatus("0");
         insPlyIncome.setInsuredName(order.getInsuredname());
         insPlyIncome.setHandlingFeesStatus("0");
@@ -198,6 +198,13 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         this.saveByCompanyId(insFeeOrderNew, insAreaCompany.getCompanyId(), insPlyIncome);
         this.getDeptId(insPlyIncome);
         baseMapper.insert(insPlyIncome);
+
+        InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+        insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
+        BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setId(null);
+        insPlyIncomeLog.setOperationStatus("1");
+        insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
     }
 
     private void saveNoSupervise(InsOrders order, InsFeeOrderNew insFeeOrderNew, InsAreaCompany insAreaCompany) {
@@ -218,7 +225,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         insPlyIncome.setAgreementId(insFeeOrderNew.getAgreementId());
         insPlyIncome.setLicenseno(order.getLicenseno());
         insPlyIncome.setTaxamount(insAreaCompany.getTaxamount());
-        insPlyIncome.setCreateTime(LocalDate.now());
+        insPlyIncome.setCreateTime(LocalDateTime.now());
         insPlyIncome.setDocumentaryFeesStatus("0");
         insPlyIncome.setHandlingFeesStatus("0");
         insPlyIncome.setIsNotCar("1");
@@ -238,6 +245,12 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         this.saveByCompanyId(insFeeOrderNew, insAreaCompany.getCompanyId(), insPlyIncome);
 
         baseMapper.insert(insPlyIncome);
+        InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+        insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
+        BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setId(null);
+        insPlyIncomeLog.setOperationStatus("1");
+        insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
     }
 
     private void saveRiskCode(String productid, InsPlyIncome insPlyIncome) {
@@ -274,7 +287,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
                 insAreaCompany.getSypolicyno(), null, null, null, null, order.getProductid(), insAreaCompany.getPayDate(),
           insAreaCompany.getSigningTime(), insAreaCompany.getCompanyId(), null, insFeeOrderNew.getAgreementId(), order.getLicenseno(),
            insAreaCompany.getTaxamount(),
-                allNoTaxPremium, null, otherProportion, null, otherAmount, otherAmount, null, null, LocalDate.now(), null, null, null, "0"
+                allNoTaxPremium, null, otherProportion, null, otherAmount, otherAmount, null, null, LocalDateTime.now(), null, null, null, "0"
                 , "0", "0", "1");
         this.saveRiskCode(order.getProductid(), insPlyIncome);
         insPlyIncome.setTaxPremium(allPremium);
@@ -296,6 +309,12 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         this.saveByCompanyId(insFeeOrderNew, insAreaCompany.getCompanyId(), insPlyIncome);
 
         baseMapper.insert(insPlyIncome);
+        InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+        insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
+        BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setId(null);
+        insPlyIncomeLog.setOperationStatus("1");
+        insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
     }
 
     private void saveInsuranceProcedures(InsOrders order, InsFeeOrderNew insFeeOrderNew, InsAreaCompany insAreaCompany) {
@@ -310,7 +329,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
          insAreaCompany.getSypolicyno(), null, null, null, null, order.getProductid(), insAreaCompany.getPayDate(),
           insAreaCompany.getSigningTime(), insAreaCompany.getCompanyId(), null, insFeeOrderNew.getAgreementId(), order.getLicenseno(),
            insAreaCompany.getTaxamount()
-                , allNoTaxPremium, handlingProportion, null, handlingAmount, null, handlingAmount, null, null, LocalDate.now(), null,
+                , allNoTaxPremium, handlingProportion, null, handlingAmount, null, handlingAmount, null, null, LocalDateTime.now(), null,
  null, null, "0", "0", "0", "0");
         BigDecimal allTaxPremium = this.calculateTotal(insFeeOrderNew.getJqPremium(), insFeeOrderNew.getSyPremium(), null);
         insPlyIncome.setJqPremium(insFeeOrderNew.getJqPremium());
@@ -332,6 +351,13 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         this.saveByCompanyId(insFeeOrderNew, insAreaCompany.getCompanyId(), insPlyIncome);
         this.getDeptId(insPlyIncome);
         baseMapper.insert(insPlyIncome);
+
+        InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+        insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
+        BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setId(null);
+        insPlyIncomeLog.setOperationStatus("1");
+        insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
     }
 
     private String setNoPolicyno(com.ydtech.modules.fnc.entity.InsAreaCompany insAreaCompany) {
@@ -416,7 +442,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
                  insAreaCompany.getCompanyId(),
                 null, insFeeOrderNew.getAgreementId(), order.getLicenseno(), insAreaCompany.getTaxamount(), allNoTaxPremium,
 handlingProportion,
-                otherProportion, handlingAmount, otherAmount, allAmount, null, null, LocalDate.now(), null, null, null, "0", "0", "0", "0");
+                otherProportion, handlingAmount, otherAmount, allAmount, null, null, LocalDateTime.now(), null, null, null, "0", "0", "0", "0");
         insPlyIncome.setJqReceivableProportion(jqReceivableProportion);
         insPlyIncome.setSyReceivableProportion(syReceivableProportion);
         insPlyIncome.setNoReceivableProportion(noReceivableProportion);
@@ -447,6 +473,14 @@ handlingProportion,
         insPlyIncome.setInsuredName(order.getInsuredname());
         this.saveByCompanyId(insFeeOrderNew, insAreaCompany.getCompanyId(), insPlyIncome);
         baseMapper.insert(insPlyIncome);
+
+        InsPlyIncomeLog insPlyIncomeLog = new InsPlyIncomeLog();
+        insPlyIncomeLog.setIncomeId(insPlyIncome.getId());
+        BeanUtils.copyProperties(insPlyIncome,insPlyIncomeLog);
+        insPlyIncomeLog.setId(null);
+        insPlyIncomeLog.setOperationStatus("1");
+        insPlyIncomeLogService.saveLog(insPlyIncomeLog);  //添加日志
+
     }
 
     private void getDeptId(InsPlyIncome insPlyIncome) {
@@ -1210,11 +1244,6 @@ handlingProportion,
         insPlyIncome.setUpdateUserId(BaseController.getUser().getId());
         baseMapper.updateById(insPlyIncome);
 
-
-//
-//        insPlyIncomeVo.setCrudStatus("2");
-//        this.saveLog(insPlyIncomeVo);
-
     }
 
     @Override
@@ -1444,7 +1473,7 @@ handlingProportion,
         insPlyIncome.setSignDate(localDateTime);
         insPlyIncome.setDeptId(BaseController.getUser().getDeptId());
 
-        insPlyIncome.setCreateTime(LocalDate.now());
+        insPlyIncome.setCreateTime(LocalDateTime.now());
         insPlyIncome.setOtherFeerate(this.calculateTotal(insPlyIncomeVo.getJqOtherCostsProportion(),insPlyIncomeVo.getSyOtherCostsProportion(),insPlyIncomeVo.getNoOtherCostsProportion()));
         insPlyIncome.setCommissionFeerate(this.calculateTotal(insPlyIncomeVo.getJqSuperviseCostsProportion(),insPlyIncomeVo.getSySuperviseCostsProportion(),insPlyIncomeVo.getNoSuperviseCostsProportion()));
 
@@ -2849,7 +2878,7 @@ handlingProportion,
         insPlyIncome.setJqReceivableProportion(this.calculateTotal(insPlyIncome.getJqSuperviseCostsProportion(),insPlyIncome.getNoOtherCostsProportion(),null));
         insPlyIncome.setSyReceivableProportion(this.calculateTotal(insPlyIncome.getSySuperviseCostsProportion(),insPlyIncome.getNoOtherCostsProportion(),null));
         insPlyIncome.setNoReceivableProportion(this.calculateTotal(insPlyIncome.getNoSuperviseCostsProportion(),insPlyIncome.getNoOtherCostsProportion(),null));
-        insPlyIncome.setCreateTime(LocalDate.now());
+        insPlyIncome.setCreateTime(LocalDateTime.now());
         insPlyIncome.setCommissionFeerate(this.calculateTotal(insPlyIncome.getJqSuperviseCostsProportion(),insPlyIncome.getSySuperviseCostsProportion(),insPlyIncome.getNoSuperviseCostsPremiums()));
         insPlyIncome.setCommissionFeevalue(this.calculateTotal(insPlyIncome.getJqSuperviseCostsPremiums(),insPlyIncome.getSySuperviseCostsPremiums(),insPlyIncome.getNoSuperviseCostsPremiums()));
         insPlyIncome.setOtherFeerate(this.calculateTotal(insPlyIncome.getJqOtherCostsProportion(),insPlyIncome.getSyOtherCostsProportion(),insPlyIncome.getNoOtherCostsProportion()));

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyMainServiceImpl.java

@@ -189,7 +189,7 @@ public class InsPlyMainServiceImpl extends ServiceImpl<InsPlyMainMapper, InsPlyM
         insPlyIncome.setAgreementId(excelVo.getAgreementId());
         insPlyIncome.setLicenseno(excelVo.getLicenseno());
         insPlyIncome.setPayDate(StringUtils.isNullOrEmpty(excelVo.getPayDate())?excelVo.getCreatetime():excelVo.getPayDate());
-        insPlyIncome.setCreateTime(LocalDate.now() );
+        insPlyIncome.setCreateTime(LocalDateTime.now() );
         insPlyIncome.setPolicyno(excelVo.getPolicyno());
         insPlyIncome.setRiskcode(excelVo.getRiskcode());
         insPlyIncome.setTaxamount(excelVo.getTaxamount());

src/main/java/com/ydtech/modules/order/service/impl/InsAreaCompanyServiceImpl.java

@@ -115,7 +115,7 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         }else if(ptlAgreement.getAuditType() == 1 && insAreaCompany.getOrderstatus().equals(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode()))
         {
             //添加默认审核 添加审核表及轨迹信息
-            insFeeAuditService.feeAudit(insAreaCompany.getOrderno(), insAreaCompany.getId(), false,FeeAuditAuditstatus.UNREVICEWED.getCode());
+            insFeeAuditService.saveDefaultInsFeeAuditAndHistory(insAreaCompany.getOrderno(), insAreaCompany.getId(), FeeAuditAuditstatus.UNREVICEWED.getCode());
         }
 
         //添加订单消息

src/main/resources/mapper/modules/ins/InsFeeOrderNewMapper.xml

@@ -988,7 +988,7 @@
             AND  o.userid =  #{vo.userDLId}
         </if>
         <if test="vo.userDLName!=null and  vo.userDLName!= ''">
-            AND  o.username=  #{vo.orderNo}
+            AND  o.username=  #{vo.userDLName}
         </if>
         <if test="vo.licenseNo!=null and  vo.licenseNo!= ''">
             AND o.licenseno =  #{vo.licenseNo}
@@ -1030,7 +1030,7 @@
             AND  o.userid =  #{vo.userDLId}
         </if>
         <if test="vo.userDLName!=null and  vo.userDLName!= ''">
-            AND  o.username=  #{vo.orderNo}
+            AND  o.username=  #{vo.userDLName}
         </if>
         <if test="vo.licenseNo!=null and  vo.licenseNo!= ''">
             AND o.licenseno =  #{vo.licenseNo}
@@ -1071,7 +1071,7 @@
             AND  o.userid =  #{vo.userDLId}
         </if>
         <if test="vo.userDLName!=null and  vo.userDLName!= ''">
-            AND  o.username=  #{vo.orderNo}
+            AND  o.username=  #{vo.userDLName}
         </if>
         <if test="vo.licenseNo!=null and  vo.licenseNo!= ''">
             AND o.licenseno =  #{vo.licenseNo}
@@ -1102,7 +1102,7 @@
           and iff.auditstatus=#{vo.auditstatus}
           AND a.user_id =  #{vo.userId}
           <if test="vo.startDate!=null and  vo.startDate!= '' and vo.endDate!=null and  vo.endDate!= ''">
-                AND iac.signingTime  BETWEEN #{vo.startDate} AND #{vo.endDate}
+                AND iac.signing_time  BETWEEN #{vo.startDate} AND #{vo.endDate}
          </if>
     </select>
     <select id="findMyAmountYSOrSSTGAmount" resultType="java.math.BigDecimal">
@@ -1121,7 +1121,7 @@
                   AND a.first_level_user_id =  #{vo.userId}
                   and iff.auditstatus = #{vo.auditstatus}
                   <if test="vo.startDate!=null and  vo.startDate!= '' and vo.endDate!=null and  vo.endDate!= ''">
-                        AND iac.signingTime  BETWEEN #{vo.startDate} AND #{vo.endDate}
+                        AND iac.signing_time  BETWEEN #{vo.startDate} AND #{vo.endDate}
                   </if>
                 UNION
                 SELECT
@@ -1135,7 +1135,7 @@
                   AND a.three_level_user_id = #{vo.userId}
                   and iff.auditstatus = #{vo.auditstatus}
                 <if test="vo.startDate!=null and  vo.startDate!= '' and vo.endDate!=null and  vo.endDate!= ''">
-                    AND iac.signingTime  BETWEEN #{vo.startDate} AND #{vo.endDate}
+                    AND iac.signing_time  BETWEEN #{vo.startDate} AND #{vo.endDate}
                 </if>
                 UNION
                 SELECT
@@ -1149,7 +1149,7 @@
                   AND a.two_level_user_id = #{vo.userId}
                   and iff.auditstatus = #{vo.auditstatus}
                  <if test="vo.startDate!=null and  vo.startDate!= '' and vo.endDate!=null and  vo.endDate!= ''">
-                    AND iac.signingTime  BETWEEN #{vo.startDate} AND #{vo.endDate}
+                    AND iac.signing_time  BETWEEN #{vo.startDate} AND #{vo.endDate}
                   </if>
             ) AS fee