问题修改

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmvehicledemand/CrmVehicledemandDto.java

@@ -74,7 +74,7 @@ public class CrmVehicledemandDto implements Dto {
     @JsonProperty(value = "configName")
     private String sketChconfiguration;
     @ApiModelProperty("其它配置说明")
-    @NotBlank(message = "参数错误：其他配置说明是必选项")
+    //@NotBlank(message = "参数错误：其他配置说明是必选项")
     private String otherConfig;
 
     @ApiModelProperty("换选装内容")

anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java

@@ -154,7 +154,11 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         CrmCustomerTempQuery query = pq.getParams();
         QueryWrapper<CrmCustomerTemp> qw = new QueryWrapper<>();
         String userSid = query.getUserSid();
-        String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
+        String sid = "";
+        if (sysOrganizationVo != null) {
+            sid = sysOrganizationVo.getSid();
+        }
         String orgSidPath = query.getOrgSidPath();
         SysOrganizationVo data = sysOrganizationFeign.selectByOrgSidPath(orgSidPath).getData();
         String orgLevelKey = data.getOrgLevelKey();
@@ -179,10 +183,6 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         if (StringUtils.isNotBlank(query.getMobile())) {
             qw.like("cct.mobile", query.getMobile());
         }
-
-        if (StringUtils.isNotBlank(query.getStaffSid())) {
-            qw.eq("cct.staffSid", query.getStaffSid());
-        }
         String remindStartDay = query.getRemindStartDay();
         String remindEndDay = query.getRemindEndDay();
         qw.apply(StringUtils.isNotBlank(remindStartDay), "date_format (cct.remind_day,'%Y-%m-%d') >= date_format('" + remindStartDay + "','%Y-%m-%d')").
@@ -425,21 +425,21 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
         String orgPath = params.getOrgPath();
         QueryWrapper<CrmCustomerTemp> qw = new QueryWrapper<>();
 
-        if(params != null){
+        if (params != null) {
-            if(StringUtils.isNotBlank(userSid)){
+            if (StringUtils.isNotBlank(userSid)) {
                 //获取用户的staffSid
                 String staffSid = sysUserFeign.fetchBySid(userSid).getData().getStaffSid();
-                qw.eq("cct.staffSid",staffSid);
+                qw.eq("cct.staffSid", staffSid);
             }
-            if(StringUtils.isNotBlank(orgPath)){
+            if (StringUtils.isNotBlank(orgPath)) {
                 orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-                qw.eq("cct.createOrgSid",orgPath);
+                qw.eq("cct.createOrgSid", orgPath);
-            }else{
+            } else {
                 orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-                qw.eq("cct.createOrgSid",orgPath);
+                qw.eq("cct.createOrgSid", orgPath);
             }
-            if(StringUtils.isNotBlank(name)){
+            if (StringUtils.isNotBlank(name)) {
-                qw.like("cct.name",name);
+                qw.like("cct.name", name);
             }
         }
         qw.orderByDesc("cct.id");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.java

@@ -89,7 +89,6 @@ public interface ScmVehicleExamineMapper extends BaseMapper<ScmVehicleExamine> {
      * 手机端-初始化验车单信息
      *
      * @param inspectedSid
-     * @param useOrgSid
      * @return
      */
     AppScmVehicleExamineInfoVo getCarInspectedInfo(@Param("inspectedSid") String inspectedSid);
@@ -108,4 +107,7 @@ public interface ScmVehicleExamineMapper extends BaseMapper<ScmVehicleExamine> {
 
     @Select("SELECT count(*) FROM scm_vehicle_examine WHERE vinNo = #{vinNo} and useOrgSid = #{orgPath} and inspectionResult = '2' ")
     int getCountByVinNo(@Param("vinNo") String vinNo, @Param("orgPath") String orgPath);
+
+    @Select("SELECT COUNT(*) FROM scm_vehicle_examine WHERE businessSid = #{businessSid}")
+    int selectCountByBusSid(String businessSid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineService.java

@@ -650,11 +650,26 @@ public class ScmVehicleExamineService extends MybatisBaseService<ScmVehicleExami
                         int price = Integer.valueOf(outsourcingApplicationDetailsVo.getPurchasePrice());//采购价格
                         Integer num = outsourcingApplicationDetailsVo.getNum();//采购数量
                         int deposit = Integer.valueOf(outsourcingApplicationDetailsVo.getDeposit());//订金
-                        if (deposit > 0) {
+                        String depositUseRuleKey = outsourcingApplicationDetailsVo.getDepositUseRuleKey();
-                            finPaymentrecordDto.setCost(price - deposit / num);//付款金额
+                        if (depositUseRuleKey.equals("001")) {
-                        } else {
+                            if (deposit > 0) {
-                            finPaymentrecordDto.setCost(price);//付款金额
+                                finPaymentrecordDto.setCost(price - deposit / num);//付款金额
+                                finPaymentrecordDto.setPayRemark("订金使用规则为" + outsourcingApplicationDetailsVo.getDepositUseRuleValue() + "," + "金额为" + (price - deposit / num));
+                            } else {
+                                finPaymentrecordDto.setCost(price);//付款金额
+                                finPaymentrecordDto.setPayRemark("订金使用规则为" + outsourcingApplicationDetailsVo.getDepositUseRuleValue() + "," + "金额为" + price);
+                            }
+                        } else if (depositUseRuleKey.equals("002")) {
+                            int i = baseMapper.selectCountByBusSid(scmVehicleExamine.getBusinessSid());
+                            if (i > 1) {
+                                finPaymentrecordDto.setCost(price);//付款金额
+                                finPaymentrecordDto.setPayRemark("订金使用规则为" + outsourcingApplicationDetailsVo.getDepositUseRuleValue() + "," + "金额为" + price);
+                            } else if (i == 1) {
+                                finPaymentrecordDto.setCost(price - deposit);
+                                finPaymentrecordDto.setPayRemark("订金使用规则为" + outsourcingApplicationDetailsVo.getDepositUseRuleValue() + "," + "金额为" + (price - deposit));
+                            }
                         }
+
                         finPaymentrecordDto.setBusSid(scmVehicleExamine.getBusinessSid());//外采申请sid
                         BaseManufacturerAllVo baseManufacturerAllVo = baseManufacturerFeign.details(outsourcingApplicationDetailsVo.getPurchasingUnitSid()).getData();
                         if (baseManufacturerAllVo != null) {