1.财务导出问题

src/main/java/com/ydtech/modules/admin/controller/DataPermissionsController.java

@@ -56,7 +56,7 @@ public class DataPermissionsController extends BaseController {
      **/
     @GetMapping("{id}")
     @ApiOperation(value = "回显")
-    public HttpResult<DataPermissions> getById(@PathVariable("id") String id ) {
+        public HttpResult<DataPermissions> getById(@PathVariable("id") String id ) {
         try {
             DataPermissions result = dataPermissionsService.getSelectById(id);
             return HttpResult.ok("查询数据成功", result);

src/main/java/com/ydtech/modules/admin/utils/DataParams.java

@@ -12,7 +12,7 @@ public class DataParams {
 
 
     @ApiModelProperty(value = "权限Map")
-    private HashMap<String,Object> stringBufferContentMap;
+    private HashMap<String,String> stringBufferContentMap;
 
 
 }

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

@@ -4029,168 +4029,174 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
     @Override
     @Transactional
     public void correctData(InsPlyIncomeVo insPlyIncomeVo) {
-        String licenseno = insPlyIncomeVo.getLicenseno();
-        HashMap<String, Object> params = new HashMap<>();
-        params.put("licenseno", licenseno);
-        List<InsPlyIncome> insPlyIncomes = baseMapper.queryNew(params);
-        if (insPlyIncomes.isEmpty()) {
-            throw new SystemException("该车牌号不存在");
-        }
+        List<String> licensenoList = insPlyIncomeVo.getLicensenoList();
+        for (String s : licensenoList) {
+            HashMap<String, Object> params = new HashMap<>();
+            params.put("licenseno", s);
+            List<InsPlyIncome> insPlyIncomes = baseMapper.queryNew(params);
+            if (insPlyIncomes.isEmpty()) {
+                throw new SystemException("该车牌号不存在");
+            }
 //      如果 该数据是平台  则转为私有 如果是私有则转为 平台
-        InsPlyIncome insPlyIncome1 = insPlyIncomes.get(0);
-        if ("1".equals(insPlyIncome1.getAgreementType())) { //平台转私有
-            BigDecimal jqPremium = insPlyIncome1.getJqPremium();  //交强保费
-            BigDecimal syPremium = insPlyIncome1.getSyPremium();  //商业保费
-            BigDecimal noPremium = insPlyIncome1.getNoPremium();  //非车保费
+            InsPlyIncome insPlyIncome1 = insPlyIncomes.get(0);
+            if ("1".equals(insPlyIncome1.getAgreementType())) { //平台转私有
+                BigDecimal jqPremium = insPlyIncome1.getJqPremium();  //交强保费
+                BigDecimal syPremium = insPlyIncome1.getSyPremium();  //商业保费
+                BigDecimal noPremium = insPlyIncome1.getNoPremium();  //非车保费
 
-            BigDecimal jqSuperviseCostsProportion = insPlyIncome1.getJqSuperviseCostsProportion();//交强手续费比例
-            BigDecimal sySuperviseCostsProportion = insPlyIncome1.getSySuperviseCostsProportion(); //商业手续费比例
-            BigDecimal noSuperviseCostsProportion = insPlyIncome1.getNoSuperviseCostsProportion(); //非车手续费比例
+                BigDecimal jqSuperviseCostsProportion = insPlyIncome1.getJqSuperviseCostsProportion();//交强手续费比例
+                BigDecimal sySuperviseCostsProportion = insPlyIncome1.getSySuperviseCostsProportion(); //商业手续费比例
+                BigDecimal noSuperviseCostsProportion = insPlyIncome1.getNoSuperviseCostsProportion(); //非车手续费比例
 
-            BigDecimal jqOtherCostsProportion = insPlyIncome1.getJqOtherCostsProportion(); //交强跟单比例
-            BigDecimal syOtherCostsProportion = insPlyIncome1.getSyOtherCostsProportion(); // 商业跟单比例
-            BigDecimal noOtherCostsProportion = insPlyIncome1.getNoOtherCostsProportion(); // 非车跟单比例
+                BigDecimal jqOtherCostsProportion = insPlyIncome1.getJqOtherCostsProportion(); //交强跟单比例
+                BigDecimal syOtherCostsProportion = insPlyIncome1.getSyOtherCostsProportion(); // 商业跟单比例
+                BigDecimal noOtherCostsProportion = insPlyIncome1.getNoOtherCostsProportion(); // 非车跟单比例
 
-            if ((jqSuperviseCostsProportion.compareTo(BigDecimal.ZERO) > 0 || sySuperviseCostsProportion.compareTo(BigDecimal.ZERO) > 0) && jqPremium.compareTo(BigDecimal.ZERO)>0 || syPremium.compareTo(BigDecimal.ZERO)>0) {  //私有手续费
-                BigDecimal commissionFeerate = this.calculateTotal(insPlyIncome1.getJqSuperviseCostsProportion(), insPlyIncome1.getSySuperviseCostsProportion(), null);
-                BigDecimal commissionFeevalue = this.calculateTotal(insPlyIncome1.getJqSuperviseCostsPremiums(), insPlyIncome1.getSySuperviseCostsPremiums(), null);
+                if ((jqSuperviseCostsProportion.compareTo(BigDecimal.ZERO) > 0 || sySuperviseCostsProportion.compareTo(BigDecimal.ZERO) > 0) && jqPremium.compareTo(BigDecimal.ZERO)>0 || syPremium.compareTo(BigDecimal.ZERO)>0) {  //私有手续费
+                    BigDecimal commissionFeerate = this.calculateTotal(insPlyIncome1.getJqSuperviseCostsProportion(), insPlyIncome1.getSySuperviseCostsProportion(), null);
+                    BigDecimal commissionFeevalue = this.calculateTotal(insPlyIncome1.getJqSuperviseCostsPremiums(), insPlyIncome1.getSySuperviseCostsPremiums(), null);
 
-                InsPlyIncome insPlyIncome = new InsPlyIncome();
-                BeanUtils.copyProperties(insPlyIncome1, insPlyIncome);
+                    InsPlyIncome insPlyIncome = new InsPlyIncome();
+                    BeanUtils.copyProperties(insPlyIncome1, insPlyIncome);
 
-                insPlyIncome.setJqOtherCostsProportion(null);
-                insPlyIncome.setJqOtherCostsPremium(null);
 
-                insPlyIncome.setSyOtherCostsProportion(null);
-                insPlyIncome.setSyOtherCostsPremium(null);
+                    insPlyIncome.setJqOtherCostsProportion(null);
+                    insPlyIncome.setJqOtherCostsPremium(null);
 
-                insPlyIncome.setNoOtherCostsProportion(null);
-                insPlyIncome.setNoOtherCostsPremium(null);
+                    insPlyIncome.setSyOtherCostsProportion(null);
+                    insPlyIncome.setSyOtherCostsPremium(null);
 
-                insPlyIncome.setNoSuperviseCostsPremiums(null);
-                insPlyIncome.setNoSuperviseCostsProportion(null);
+                    insPlyIncome.setNoOtherCostsProportion(null);
+                    insPlyIncome.setNoOtherCostsPremium(null);
 
-                insPlyIncome.setOtherFeerate(null);
-                insPlyIncome.setOtherFeevalue(null);
+                    insPlyIncome.setNoSuperviseCostsPremiums(null);
+                    insPlyIncome.setNoSuperviseCostsProportion(null);
 
-                insPlyIncome.setCommissionFeerate(commissionFeerate);
-                insPlyIncome.setCommissionFeevalue(commissionFeevalue);
-                insPlyIncome.setAllFeeValue(commissionFeevalue);
-                insPlyIncome.setAgreementId(insPlyIncomeVo.getAgreementId());
-                insPlyIncome.setId(null);
+                    insPlyIncome.setOtherFeerate(null);
+                    insPlyIncome.setOtherFeevalue(null);
 
-                baseMapper.insert(insPlyIncome);
-            }
+                    insPlyIncome.setCommissionFeerate(commissionFeerate);
+                    insPlyIncome.setCommissionFeevalue(commissionFeevalue);
+                    insPlyIncome.setAllFeeValue(commissionFeevalue);
+                    insPlyIncome.setReceivableAmount(commissionFeevalue);
+                    insPlyIncome.setAgreementId(insPlyIncomeVo.getAgreementId());
+                    insPlyIncome.setId(null);
+
+                    baseMapper.insert(insPlyIncome);
+                }
 
-            if ((jqOtherCostsProportion.compareTo(BigDecimal.ZERO) > 0 || syOtherCostsProportion.compareTo(BigDecimal.ZERO) > 0) && jqPremium.compareTo(BigDecimal.ZERO)>0 || syPremium.compareTo(BigDecimal.ZERO)>0) {
+                if ((jqOtherCostsProportion.compareTo(BigDecimal.ZERO) > 0 || syOtherCostsProportion.compareTo(BigDecimal.ZERO) > 0) && jqPremium.compareTo(BigDecimal.ZERO)>0 || syPremium.compareTo(BigDecimal.ZERO)>0) {
 
-                BigDecimal syOtherAmount = algorithmAmount(insPlyIncome1.getSyPremium(), insPlyIncome1.getSyOtherCostsProportion());
-                BigDecimal jqOtherAmount = algorithmAmount(insPlyIncome1.getJqPremium(), insPlyIncome1.getJqOtherCostsProportion());
+                    BigDecimal syOtherAmount = algorithmAmount(insPlyIncome1.getSyPremium(), insPlyIncome1.getSyOtherCostsProportion());
+                    BigDecimal jqOtherAmount = algorithmAmount(insPlyIncome1.getJqPremium(), insPlyIncome1.getJqOtherCostsProportion());
 
 
-                BigDecimal otherFvalue = this.calculateTotal(syOtherAmount, jqOtherAmount, null);
-                BigDecimal otherFeet = this.calculateTotal(insPlyIncome1.getJqOtherCostsProportion(), insPlyIncome1.getSyOtherCostsProportion(), null);
+                    BigDecimal otherFvalue = this.calculateTotal(syOtherAmount, jqOtherAmount, null);
+                    BigDecimal otherFeet = this.calculateTotal(insPlyIncome1.getJqOtherCostsProportion(), insPlyIncome1.getSyOtherCostsProportion(), null);
 
-                InsPlyIncome insPlyIncome = new InsPlyIncome();
-                BeanUtils.copyProperties(insPlyIncome1, insPlyIncome);
+                    InsPlyIncome insPlyIncome = new InsPlyIncome();
+                    BeanUtils.copyProperties(insPlyIncome1, insPlyIncome);
 
-                insPlyIncome.setNoOtherCostsProportion(null);
-                insPlyIncome.setNoOtherCostsPremium(null);
+                    insPlyIncome.setNoOtherCostsProportion(null);
+                    insPlyIncome.setNoOtherCostsPremium(null);
 
-                insPlyIncome.setNoSuperviseCostsPremiums(null);
-                insPlyIncome.setNoSuperviseCostsProportion(null);
+                    insPlyIncome.setNoSuperviseCostsPremiums(null);
+                    insPlyIncome.setNoSuperviseCostsProportion(null);
 
-                insPlyIncome.setJqSuperviseCostsProportion(null);
-                insPlyIncome.setJqSuperviseCostsPremiums(null);
+                    insPlyIncome.setJqSuperviseCostsProportion(null);
+                    insPlyIncome.setJqSuperviseCostsPremiums(null);
 
-                insPlyIncome.setSySuperviseCostsPremiums(null);
-                insPlyIncome.setSySuperviseCostsProportion(null);
+                    insPlyIncome.setSySuperviseCostsPremiums(null);
+                    insPlyIncome.setSySuperviseCostsProportion(null);
 
-                insPlyIncome.setCommissionFeevalue(null);
-                insPlyIncome.setCommissionFeerate(null);
+                    insPlyIncome.setCommissionFeevalue(null);
+                    insPlyIncome.setCommissionFeerate(null);
 
-                insPlyIncome.setJqOtherCostsPremium(jqOtherAmount);
-                insPlyIncome.setSyOtherCostsPremium(syOtherAmount);
-                insPlyIncome.setOtherFeevalue(otherFvalue);
-                insPlyIncome.setOtherFeerate(otherFeet);
-                insPlyIncome.setAllFeeValue(otherFvalue);
-                insPlyIncome.setAgreementId(insPlyIncomeVo.getAgreementId());
-                insPlyIncome.setIsNotDocumentary("1");
-                insPlyIncome.setId(null);
+                    insPlyIncome.setJqOtherCostsPremium(jqOtherAmount);
+                    insPlyIncome.setSyOtherCostsPremium(syOtherAmount);
+                    insPlyIncome.setOtherFeevalue(otherFvalue);
+                    insPlyIncome.setOtherFeerate(otherFeet);
+                    insPlyIncome.setAllFeeValue(otherFvalue);
+                    insPlyIncome.setReceivableAmount(otherFvalue);
+                    insPlyIncome.setAgreementId(insPlyIncomeVo.getAgreementId());
+                    insPlyIncome.setIsNotDocumentary("1");
+                    insPlyIncome.setId(null);
 
-                baseMapper.insert(insPlyIncome);
-            }
+                    baseMapper.insert(insPlyIncome);
+                }
 
-            if (noSuperviseCostsProportion.compareTo(BigDecimal.ZERO)>0 &&  noPremium.compareTo(BigDecimal.ZERO)>0) {  //非车手续费
-                InsPlyIncome insPlyIncome = new InsPlyIncome();
-                BeanUtils.copyProperties(insPlyIncome1, insPlyIncome);
+                if (noSuperviseCostsProportion.compareTo(BigDecimal.ZERO)>0 &&  noPremium.compareTo(BigDecimal.ZERO)>0) {  //非车手续费
+                    InsPlyIncome insPlyIncome = new InsPlyIncome();
+                    BeanUtils.copyProperties(insPlyIncome1, insPlyIncome);
 
-                insPlyIncome.setJqSuperviseCostsPremiums(null);
-                insPlyIncome.setJqSuperviseCostsProportion(null);
+                    insPlyIncome.setJqSuperviseCostsPremiums(null);
+                    insPlyIncome.setJqSuperviseCostsProportion(null);
 
-                insPlyIncome.setSySuperviseCostsPremiums(null);
-                insPlyIncome.setSySuperviseCostsProportion(null);
+                    insPlyIncome.setSySuperviseCostsPremiums(null);
+                    insPlyIncome.setSySuperviseCostsProportion(null);
 
-                insPlyIncome.setJqOtherCostsPremium(null);
-                insPlyIncome.setJqOtherCostsProportion(null);
+                    insPlyIncome.setJqOtherCostsPremium(null);
+                    insPlyIncome.setJqOtherCostsProportion(null);
 
-                insPlyIncome.setSyOtherCostsProportion(null);
-                insPlyIncome.setSyOtherCostsPremium(null);
+                    insPlyIncome.setSyOtherCostsProportion(null);
+                    insPlyIncome.setSyOtherCostsPremium(null);
 
-                insPlyIncome.setNoOtherCostsProportion(null);
-                insPlyIncome.setNoOtherCostsPremium(null);
+                    insPlyIncome.setNoOtherCostsProportion(null);
+                    insPlyIncome.setNoOtherCostsPremium(null);
 
 
-                insPlyIncome.setOtherFeevalue(null);
-                insPlyIncome.setOtherFeerate(null);
+                    insPlyIncome.setOtherFeevalue(null);
+                    insPlyIncome.setOtherFeerate(null);
 
-                insPlyIncome.setCommissionFeevalue(insPlyIncome1.getNoSuperviseCostsPremiums());
-                insPlyIncome.setCommissionFeerate(insPlyIncome1.getNoSuperviseCostsProportion());
-                insPlyIncome.setAllFeeValue(insPlyIncome1.getNoSuperviseCostsPremiums());
+                    insPlyIncome.setCommissionFeevalue(insPlyIncome1.getNoSuperviseCostsPremiums());
+                    insPlyIncome.setCommissionFeerate(insPlyIncome1.getNoSuperviseCostsProportion());
+                    insPlyIncome.setAllFeeValue(insPlyIncome1.getNoSuperviseCostsPremiums());
 
-                insPlyIncome.setAgreementId(insPlyIncomeVo.getAgreementId());
-                insPlyIncome.setId(null);
-                insPlyIncome.setIsNotCar("1");
-                baseMapper.insert(insPlyIncome);
-            }
+                    insPlyIncome.setAgreementId(insPlyIncomeVo.getAgreementId());
+                    insPlyIncome.setId(null);
+                    insPlyIncome.setIsNotCar("1");
+                    insPlyIncome.setReceivableAmount(insPlyIncome1.getNoSuperviseCostsPremiums());
+                    baseMapper.insert(insPlyIncome);
+                }
 
-            if (noOtherCostsProportion .compareTo(BigDecimal.ZERO) >0 && noPremium.compareTo(BigDecimal.ZERO)>0) {
+                if (noOtherCostsProportion .compareTo(BigDecimal.ZERO) >0 && noPremium.compareTo(BigDecimal.ZERO)>0) {
 
-                //                algorithmAmount(syPremium, syOtherCostsProportion)
-                BigDecimal noOtherAmount = algorithmAmount(insPlyIncome1.getNoPremium(), insPlyIncome1.getNoOtherCostsProportion());
+                    //                algorithmAmount(syPremium, syOtherCostsProportion)
+                    BigDecimal noOtherAmount = algorithmAmount(insPlyIncome1.getNoPremium(), insPlyIncome1.getNoOtherCostsProportion());
 
 
-                InsPlyIncome insPlyIncome = new InsPlyIncome();
-                BeanUtils.copyProperties(insPlyIncome1, insPlyIncome);
+                    InsPlyIncome insPlyIncome = new InsPlyIncome();
+                    BeanUtils.copyProperties(insPlyIncome1, insPlyIncome);
 
-                insPlyIncome.setJqSuperviseCostsPremiums(null);
-                insPlyIncome.setJqSuperviseCostsProportion(null);
+                    insPlyIncome.setJqSuperviseCostsPremiums(null);
+                    insPlyIncome.setJqSuperviseCostsProportion(null);
 
-                insPlyIncome.setSySuperviseCostsPremiums(null);
-                insPlyIncome.setSySuperviseCostsProportion(null);
+                    insPlyIncome.setSySuperviseCostsPremiums(null);
+                    insPlyIncome.setSySuperviseCostsProportion(null);
 
-                insPlyIncome.setJqOtherCostsPremium(null);
-                insPlyIncome.setJqOtherCostsProportion(null);
+                    insPlyIncome.setJqOtherCostsPremium(null);
+                    insPlyIncome.setJqOtherCostsProportion(null);
 
-                insPlyIncome.setSyOtherCostsProportion(null);
-                insPlyIncome.setSyOtherCostsPremium(null);
+                    insPlyIncome.setSyOtherCostsProportion(null);
+                    insPlyIncome.setSyOtherCostsPremium(null);
 
-                insPlyIncome.setNoSuperviseCostsPremiums(null);
-                insPlyIncome.setNoSuperviseCostsProportion(null);
+                    insPlyIncome.setNoSuperviseCostsPremiums(null);
+                    insPlyIncome.setNoSuperviseCostsProportion(null);
 
-                insPlyIncome.setCommissionFeerate(null);
-                insPlyIncome.setCommissionFeevalue(null);
+                    insPlyIncome.setCommissionFeerate(null);
+                    insPlyIncome.setCommissionFeevalue(null);
 
-                insPlyIncome.setOtherFeevalue(noOtherAmount);
-                insPlyIncome.setOtherFeerate(insPlyIncome1.getNoOtherCostsProportion());
+                    insPlyIncome.setOtherFeevalue(noOtherAmount);
+                    insPlyIncome.setOtherFeerate(insPlyIncome1.getNoOtherCostsProportion());
 
-                insPlyIncome.setNoOtherCostsPremium(noOtherAmount);
-                insPlyIncome.setAgreementId(insPlyIncomeVo.getAgreementId());
-                insPlyIncome.setAllFeeValue(insPlyIncome1.getNoOtherCostsPremium());
-                insPlyIncome.setId(null);
-                insPlyIncome.setIsNotCar("1");
-                insPlyIncome.setIsNotDocumentary("1");
-                baseMapper.insert(insPlyIncome);
+                    insPlyIncome.setNoOtherCostsPremium(noOtherAmount);
+                    insPlyIncome.setAgreementId(insPlyIncomeVo.getAgreementId());
+                    insPlyIncome.setAllFeeValue(insPlyIncome1.getNoOtherCostsPremium());
+                    insPlyIncome.setId(null);
+                    insPlyIncome.setIsNotCar("1");
+                    insPlyIncome.setIsNotDocumentary("1");
+                    baseMapper.insert(insPlyIncome);
+                }
             }
         }
     }

src/main/java/com/ydtech/modules/fnc/vo/ContractVo.java

@@ -122,4 +122,7 @@ public class ContractVo  extends DataParams implements Serializable {
 
     @ApiModelProperty("是否是查看详情")
     private String isView;
+
+    @ApiModelProperty("是否是查看详情")
+    private String inValue;
 }

src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -429,4 +429,7 @@ public class InsPlyIncomeVo implements Serializable {
     private String status;
 
 
+
+    @ApiModelProperty(value = "车牌号list")
+    private List<String> licensenoList;
 }

src/main/java/com/ydtech/modules/inv/utils/CheckInsPlyComeUtils.java

@@ -239,9 +239,9 @@ public class CheckInsPlyComeUtils {
         if(checkIsNull(dto.getPolicyno(), "交强保单号")!=null){
             errorMsg+=checkIsNull(dto.getPolicyno(), "交强保单号")+"; ";
         }
-        if(checkIsNull(dto.getSyPolicyno(), "商业保单号")!=null){
-            errorMsg+=checkIsNull(dto.getSyPolicyno(), "商业保单号")+"; ";
-        }
+//        if(checkIsNull(dto.getSyPolicyno(), "商业保单号")!=null){
+//            errorMsg+=checkIsNull(dto.getSyPolicyno(), "商业保单号")+"; ";
+//        }
         if(isNumeric(dto.getJqPremium(), "交强险保费")!=null){
             errorMsg+=isNumeric(dto.getJqPremium(), "交强险保费")+"; ";
         }
@@ -370,9 +370,9 @@ public class CheckInsPlyComeUtils {
         if(checkIsNull(dto.getPolicyno(), "交强保单号")!=null){
             errorMsg+=checkIsNull(dto.getPolicyno(), "交强保单号")+"; ";
         }
-        if(checkIsNull(dto.getSyPolicyno(), "商业保单号")!=null){
-            errorMsg+=checkIsNull(dto.getSyPolicyno(), "商业保单号")+"; ";
-        }
+//        if(checkIsNull(dto.getSyPolicyno(), "商业保单号")!=null){
+//            errorMsg+=checkIsNull(dto.getSyPolicyno(), "商业保单号")+"; ";
+//        }
         if(isNumeric(dto.getJqPremium(), "交强险保费")!=null){
             errorMsg+=isNumeric(dto.getJqPremium(), "交强险保费")+"; ";
         }
@@ -662,9 +662,9 @@ public class CheckInsPlyComeUtils {
         if(checkIsNull(dto.getPolicyno(), "交强保单号")!=null){
             errorMsg+=checkIsNull(dto.getPolicyno(), "交强保单号")+"; ";
         }
-        if(checkIsNull(dto.getSyPolicyno(), "商业保单号")!=null){
-            errorMsg+=checkIsNull(dto.getSyPolicyno(), "商业保单号")+"; ";
-        }
+//        if(checkIsNull(dto.getSyPolicyno(), "商业保单号")!=null){
+//            errorMsg+=checkIsNull(dto.getSyPolicyno(), "商业保单号")+"; ";
+//        }
         if(checkIsNull(dto.getNoPolicyno(), "非车保单号")!=null){
             errorMsg+=checkIsNull(dto.getNoPolicyno(), "非车保单号")+"; ";
         }

src/main/resources/mapper/modules/admin/DataPermissionsMapper.xml

@@ -26,10 +26,13 @@
         select * from ins_data_permissions a
         <where>
             <if test="vo.menuId !=null  and  vo.menuId !=''">
-              and  a.menu_id =#{vo.menuId}
+                and a.menu_id =#{vo.menuId}
+            </if>
+            <if test="vo.status !=null  and  vo.status!=''">
+                and a.status =#{vo.status}
             </if>
             <if test="vo.permissionsList !=null  and  vo.permissionsList !=''  and  vo.permissionsList.size()>0">
-              and  a.id  in
+                and a.id in
                 <foreach collection="vo.permissionsList" item="id" index="index" open="(" close=")" separator=",">
                     #{id}
                 </foreach>