还款到期，融信到期生成到期

taskMan/src/main/java/com/huyi/task/taskMan/schedule/FinanceTimedTask.java

@@ -59,9 +59,12 @@ public class FinanceTimedTask {
             //最短账期
             String shortestPeriod= productList.get(i).getZfpShortestPeriod();
             Map map = new HashMap();
-            //据当前时间还有30天的日期
+            //据当前时间还有30天的日期,给经办人发消息提醒
             String day = DateUtils.getFetureDate(30+Integer.parseInt(shortestPeriod));
             map.put("day",day);
+            //获取产品编号
+            String zfpId = productList.get(i).getZfpId();
+            map.put("zfpId",zfpId);
             //融信信息
             List<Map> list = financeTimedTaskService.selectFinanceInfList(map);
             if(list.size()>0){
@@ -106,6 +109,9 @@ public class FinanceTimedTask {
             //据当前时间还有7天的日期
             String day = DateUtils.getFetureDate(7+Integer.parseInt(shortestPeriod));
             map.put("day",day);
+            //获取产品编号
+            String zfpId = productList.get(i).getZfpId();
+            map.put("zfpId",zfpId);
             //融信信息
             List<Map> list = financeTimedTaskService.selectFinanceInfList(map);
             if(list.size()>0){
@@ -144,6 +150,9 @@ public class FinanceTimedTask {
             //据当前时间还有30天的日期
             String day = DateUtils.getFetureDate(5+Integer.parseInt(shortestPeriod));
             map.put("day",day);
+            //获取产品编号
+            String zfpId = productList.get(i).getZfpId();
+            map.put("zfpId",zfpId);
             //融信信息
             List<Map> list = financeTimedTaskService.selectFinanceInfList(map);
             if(list.size()>0){
@@ -193,6 +202,9 @@ public class FinanceTimedTask {
             //据当前时间还有30天的日期
             String day = DateUtils.getFetureDate(3+Integer.parseInt(shortestPeriod));
             map.put("day",day);
+            //获取产品编号
+            String zfpId = productList.get(i).getZfpId();
+            map.put("zfpId",zfpId);
             //融信信息
             List<Map> list = financeTimedTaskService.selectFinanceInfList(map);
             if(list.size()>0){
@@ -217,8 +229,13 @@ public class FinanceTimedTask {
                     companyWrapper.eq(SysUserCompanyRel::getSucrDeptId,deptId);
                     companyWrapper.eq(SysUserCompanyRel::getSucrCompanyId,"000000");
                     List<SysUserCompanyRel> userList = sysUserCompanyRelService.findSysUserCompanyRels(companyWrapper);
-                    for (SysUserCompanyRel sysUser:userList) {
-                        user += CommonUtil.objToString(sysUser.getSucrUserId())+",";
+                    for(int j = 0 ; j < userList.size();j++){
+                        //最后一个
+                        if(j == userList.size() -1){
+                            user += userList.get(j).getSucrUserId();
+                        }else{
+                            user += userList.get(j).getSucrUserId()+",";
+                        }
                     }
 //                    List userList = new ArrayList();
 //                    userList.add(user);

taskMan/src/main/java/com/huyi/task/taskMan/schedule/TimedTask.java

@@ -124,11 +124,11 @@ public class TimedTask {
                 if("2".equals(createType)){
                     //到期前7天生成待办
                     String title = "【还款待办】您签发的融信【"+number+"】将于【"+repaymentDate+"】还款，还款金额【"+amount+"】（大写："+ ConvertUpMoneyUtil.toChinese(amount)+"），请尽快处理；";
-                    remoteSystemService.sendNotice(companyId, zfrId,title,"00","","06","0",user,"","00",null);
+                    remoteSystemService.sendNotice(companyId, zfrId,title,"00","","06","0",user,"","01","/repayment/repayment");
                 }else{
                     //到期前7天生成待办
                     String title = "【还款待办】您签发的融信【"+number+"】将于【"+repaymentDate+"】还款，还款金额【"+amount+"】（大写："+ConvertUpMoneyUtil.toChinese(amount)+"），请尽快处理；";
-                    remoteSystemService.sendNotice(coreCompany, zfrId,title,"00","","06","0",handler,"","00",null);
+                    remoteSystemService.sendNotice(coreCompany, zfrId,title,"00","","06","0",handler,"","01","/repayment/repayment");
                 }
 
             }
@@ -203,8 +203,13 @@ public class TimedTask {
                 queryWrapper.eq(SysUserCompanyRel::getSucrDeptId,deptId);
                 queryWrapper.eq(SysUserCompanyRel::getSucrCompanyId,"000000");
                 List<SysUserCompanyRel> userList = sysUserCompanyRelService.findSysUserCompanyRels(queryWrapper);
-                for (SysUserCompanyRel sysUser:userList) {
-                    user += CommonUtil.objToString(sysUser.getSucrUserId())+",";
+                for(int j = 0 ; j < userList.size();j++){
+                    //最后一个
+                    if(j == userList.size() -1){
+                        user += userList.get(j).getSucrUserId();
+                    }else{
+                        user += userList.get(j).getSucrUserId()+",";
+                    }
                 }
                 //到期前3天平台内部待办  参数: 企业,表主键,标题,类型(00:待办 01:消息),消息类型(00:费用提醒01:发票寄出02:到期还款)
                 //待办类型(00:待审批01:链属企业申请02:融信失效03:还款),是否发送短信(0:不发1:发),收到信息用户集合，短信模板

taskMan/src/main/resources/mapper/taskMan/FinanceTimedTaskMapper.xml

@@ -8,7 +8,7 @@
           i.zfi_number            'zfiNumber',
           i.zfi_amount            'zfiAmount',
           i.zfi_effective_date    'zfiEffectiveDate',
-          i.zfi_expire_date       'zfiExpireDate'
+          DATE_FORMAT(i.zfi_expire_date,'%Y-%m-%d')      'zfiExpireDate'
           p.zfp_shortest_period   'zfpShortestPeriod',
           u.sucr_user_id          'sucrUserId',
           u.sucr_company_id       'sucrCompanyId',
@@ -30,7 +30,8 @@
           LEFT JOIN sys_user r
             ON r.user_id = u.sucr_user_id
         WHERE zfi_status = '02'
-              and zfi_effective_date = #{day}
+              and DATE(zfi_effective_date) = DATE(#{day})
+              and zfp_id = #{zfpId}
     </select>
     <select id="selectFinanceInfDetail" parameterType="map" resultType="map">
         SELECT

taskMan/src/main/resources/mapper/taskMan/OwnTaskManMapper.xml

@@ -23,8 +23,9 @@
         on i.zfi_core_id = sys.sucr_company_id
         where 1=1
         and s.sucr_handler = '1'
+        and sys.sucr_handler = '1'
         and zfr_apply_status = '00'
-        and r.zfr_repayment_date = #{day}
+        and DATE(r.zfr_repayment_date) = DATE(#{day})
     </select>
 
 </mapper>