修改供应商开立等bug

sc-service/src/main/java/com/huyi/service/credit/controller/OwnCreditController.java

@@ -9,6 +9,7 @@ import com.huyi.service.common.flowable.service.ApprovalService;
 import com.huyi.service.credit.service.OwnCreditService;
 import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
 import com.tianhu.common.core.domain.R;
+import com.tianhu.common.core.exception.BaseException;
 import com.tianhu.common.core.utils.AmtUtil;
 import com.tianhu.common.core.utils.CommonUtil;
 import com.tianhu.common.core.utils.DateUtils;
@@ -1032,6 +1033,8 @@ public class OwnCreditController extends BaseController {
             String zfiExpireDate = CommonUtil.objToString(map.get("zfiExpireDate"));
             //签发有效期
             String zfiEffectiveDate = CommonUtil.objToString(map.get("zfiEffectiveDate"));
+            //最短账期
+            String zfpShortestPeriod = CommonUtil.objToString(map.get("zfpShortestPeriod"));
             if(CommonUtil.isEmpty(zfiEffectiveDate)){
                 throw new Exception("请选择签发有效期");
             }
@@ -1043,6 +1046,17 @@ public class OwnCreditController extends BaseController {
             inf.setZfiEffectiveDate(date);
             Date signDate = simpleDateFormat.parse(zfiExpireDate);
             inf.setZfiExpireDate(signDate);
+            //取得指定时间间隔后的系统时间
+            GregorianCalendar cal = new GregorianCalendar();
+            cal.setTime(date);
+            cal.add(Calendar.DATE, Integer.valueOf(zfpShortestPeriod));
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+            System.out.println("签发有效期=========>"+formatter.format(date));
+            System.out.println("承诺付款日=========>"+formatter.format(signDate));
+            System.out.println("最短账期=========>"+Integer.valueOf(zfpShortestPeriod));
+            if(formatter.format(date).compareTo(formatter.format(signDate))>0){
+                throw new BaseException("签发有效期不可大于承诺付款日减最短账期！");
+            }
         }
 
         //创建人

sc-service/src/main/java/com/huyi/service/rel/controller/CompanyRelImportController.java

@@ -49,7 +49,7 @@ import java.util.regex.Pattern;
 
 /**
  * 链属导入Controller
- * 
+ *
  * @author keao
  * @date 2020-12-16
  */
@@ -467,6 +467,7 @@ public class CompanyRelImportController extends BaseController
                     remoteSystemService.sendNotice(scyId, id,title,"01","03",null,"0",longs.toString(),null,null,null);
                 }
             }else {
+                map.put("hId",hId);
                R r = iOwnCompanyRelService.addCompanySpare(map);
                if(r.getCode() != 200) {
                    String msg = r.getMsg();

sc-service/src/main/java/com/huyi/service/rel/service/impl/OwnCompanyRelServiceImpl.java

@@ -117,6 +117,8 @@ public class OwnCompanyRelServiceImpl extends ServiceImpl<OwnCompanyRelMapper, S
         String scrContarct = CommonUtil.objToString(map.get("scrContarct"));
         //链属联系人手机号
         String scrContarctPhone = CommonUtil.objToString(map.get("scrContarctPhone"));
+        //发起方
+        String hId = CommonUtil.objToString(map.get("hId"));
 
         //查询企业是否已经存在
         LambdaQueryWrapper<SysCompany> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -129,7 +131,7 @@ public class OwnCompanyRelServiceImpl extends ServiceImpl<OwnCompanyRelMapper, S
         List<SysCompany> list = iSysCompanyService.findSysCompanys(lambdaQueryWrapper);
         if (list.size() > 0) {
             LambdaQueryWrapper<SysCompanySpare> spareLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            spareLambdaQueryWrapper.eq(SysCompanySpare::getScpCompanyId, companyId);
+            spareLambdaQueryWrapper.eq(SysCompanySpare::getScpCompanyId, hId);
             spareLambdaQueryWrapper.ne(SysCompanySpare::getScpStatus, "99");
             spareLambdaQueryWrapper.eq(SysCompanySpare::getScpSocialCode, scySocialCode);
             List<SysCompanySpare> spareList = iSysCompanySpareService.findSysCompanySpares(spareLambdaQueryWrapper);
@@ -149,7 +151,7 @@ public class OwnCompanyRelServiceImpl extends ServiceImpl<OwnCompanyRelMapper, S
             scyId = list.get(0).getScyId();
             SysCompanyRel sysCompanyRel = new SysCompanyRel();
             sysCompanyRel.setScrId(scrId);
-            sysCompanyRel.setScrLaunchCompanyId(companyId);
+            sysCompanyRel.setScrLaunchCompanyId(hId);
             sysCompanyRel.setScrReceiveCompanyId(scyId);
             //发起方为核心企业01
             sysCompanyRel.setScrLaunchType(CONFIRM_STATE);
@@ -164,7 +166,7 @@ public class OwnCompanyRelServiceImpl extends ServiceImpl<OwnCompanyRelMapper, S
             //新增链属公司信息
             SysCompanySpare sysCompanySpare = new SysCompanySpare();
             sysCompanySpare.setScpId(scpId);
-            sysCompanySpare.setScpCompanyId(companyId);
+            sysCompanySpare.setScpCompanyId(hId);
             sysCompanySpare.setScpRelId(scrId);
             //企业名称
             sysCompanySpare.setScpName(scyName);
@@ -199,7 +201,7 @@ public class OwnCompanyRelServiceImpl extends ServiceImpl<OwnCompanyRelMapper, S
                 return R.fail("企业名称与统一代码不匹配，不可链属此企业");
             }
             LambdaQueryWrapper<SysCompanySpare> spareLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            spareLambdaQueryWrapper.eq(SysCompanySpare::getScpCompanyId, companyId);
+            spareLambdaQueryWrapper.eq(SysCompanySpare::getScpCompanyId, hId);
             spareLambdaQueryWrapper.ne(SysCompanySpare::getScpStatus, "99");
             spareLambdaQueryWrapper.eq(SysCompanySpare::getScpSocialCode, scySocialCode);
             List<SysCompanySpare> spareList = iSysCompanySpareService.findSysCompanySpares(spareLambdaQueryWrapper);
@@ -218,7 +220,7 @@ public class OwnCompanyRelServiceImpl extends ServiceImpl<OwnCompanyRelMapper, S
             //新增链属公司信息
             SysCompanySpare sysCompanySpare = new SysCompanySpare();
             sysCompanySpare.setScpId(scpId);
-            sysCompanySpare.setScpCompanyId(companyId);
+            sysCompanySpare.setScpCompanyId(hId);
             //企业名称
             sysCompanySpare.setScpName(scyName);
             //统一社会信用代码

sc-service/src/main/java/com/huyi/service/repayment/controller/repaymentController.java

@@ -592,7 +592,7 @@ public class repaymentController extends BaseController {
             yhkMap.put("zfpType","1");
         }
         //已还款
-        yhkMap.put("zfrApplyStatus","01");
+          yhkMap.put("zfrApplyStatus","01");
         Map yhkAmount = ownRepaymentService.selectAmount(yhkMap);
         //已逾期
         Map yyqMap = new HashMap();

sc-service/src/main/resources/mapper/credit/OwnCreditMapper.xml

@@ -128,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     DATE_FORMAT(rel.zfpcr_end_date,'%Y-%m-%d')        'zfpcrEndDate',
                     p.zfp_id                                          'zfpId',
                     rel.zfpcr_rate                                    'zfpcrRate',
+                    p.zfp_shortest_period                              'zfpShortestPeriod',
                     p.zfp_auth_type                                   'zfpAuthType',
                     p.zfp_minimum_amount                              'zfpMinimumAmount'
              FROM   zc_finance_pro_com_rel rel
@@ -162,6 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     rel.zfpcr_rate                                    'zfpcrRate',
                     p.zfp_auth_type                                    'zfpAuthType',
                     p.zfp_platform                                     'zfpPlatform',
+                    p.zfp_shortest_period                              'zfpShortestPeriod',
                     p.zfp_minimum_amount                              'zfpMinimumAmount'
 
              FROM   zc_finance_supplier_quota q