Merge remote-tracking branch 'origin/master'

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/ordermanager/service/impl/HwOrderServiceImpl.java

@@ -52,6 +52,8 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -905,43 +907,33 @@ public class HwOrderServiceImpl extends ServiceImpl<HwOrderMapper, HwOrder> impl
      * @return
      */
     public List<HwContractTemplate> makeContractTemplate(HwOrder hwOrder, HwSubcontractor hwSubcontractor, HwUser hwUser) {
+        // 签署日期
+        LocalDate localDate = LocalDate.now(ZoneId.of("+8"));
         List<HwContractTemplate> hwContractTemplateList = new ArrayList<>();
         HwContractTemplate hwContractTemplate0 = new HwContractTemplate();
-        hwContractTemplate0.setName("企业名称");
+        hwContractTemplate0.setName("firstpartytitle");
         hwContractTemplate0.setValue(hwSubcontractor.getName());
         hwContractTemplateList.add(hwContractTemplate0);
         HwContractTemplate hwContractTemplate1 = new HwContractTemplate();
-        hwContractTemplate1.setName("企业名称2");
-        hwContractTemplate1.setValue(hwSubcontractor.getName());
+        hwContractTemplate1.setName("thirdpartytitle");
+        hwContractTemplate1.setValue("指定第三方");
         hwContractTemplateList.add(hwContractTemplate1);
         HwContractTemplate hwContractTemplate2 = new HwContractTemplate();
-        hwContractTemplate2.setName("合作伙伴");
-        hwContractTemplate2.setValue("指定第三方");
+        hwContractTemplate2.setName("servicerequirementname");
+        hwContractTemplate2.setValue(hwOrder.getHwRequirement().getName());
         hwContractTemplateList.add(hwContractTemplate2);
         HwContractTemplate hwContractTemplate3 = new HwContractTemplate();
-        hwContractTemplate3.setName("服务名称");
-        hwContractTemplate3.setValue(hwOrder.getHwRequirement().getName());
+        hwContractTemplate3.setName("contractsignyear");
+        hwContractTemplate3.setValue(String.valueOf(localDate.getYear()));
         hwContractTemplateList.add(hwContractTemplate3);
         HwContractTemplate hwContractTemplate4 = new HwContractTemplate();
-        hwContractTemplate4.setName("合作伙伴1");
-        hwContractTemplate4.setValue("指定第三方");
+        hwContractTemplate4.setName("contractsignmonth");
+        hwContractTemplate4.setValue(String.valueOf(localDate.getMonthValue()));
         hwContractTemplateList.add(hwContractTemplate4);
         HwContractTemplate hwContractTemplate5 = new HwContractTemplate();
-        hwContractTemplate5.setName("甲方签署日期");
-        hwContractTemplate5.setValue(DateUtils.date_sdf_wz.format(new Date()));
+        hwContractTemplate5.setName("contractsignday");
+        hwContractTemplate5.setValue(String.valueOf(localDate.getDayOfMonth()));
         hwContractTemplateList.add(hwContractTemplate5);
-        HwContractTemplate hwContractTemplate6 = new HwContractTemplate();
-        hwContractTemplate6.setName("乙方签署日期");
-        hwContractTemplate6.setValue(DateUtils.date_sdf_wz.format(new Date()));
-        hwContractTemplateList.add(hwContractTemplate6);
-        HwContractTemplate hwContractTemplate7 = new HwContractTemplate();
-        hwContractTemplate7.setName("服务名称1");
-        hwContractTemplate7.setValue(hwOrder.getHwRequirement().getName());
-        hwContractTemplateList.add(hwContractTemplate7);
-        HwContractTemplate hwContractTemplate8 = new HwContractTemplate();
-        hwContractTemplate8.setName("企业名称1");
-        hwContractTemplate8.setValue(hwSubcontractor.getName());
-        hwContractTemplateList.add(hwContractTemplate8);
         return hwContractTemplateList;
     }
 

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/subcontratormanager/entity/HwSubcontractor.java

@@ -179,4 +179,9 @@ public class HwSubcontractor implements Serializable {
      * 渠道/平台合作企业经办人（操作员）ID
      */
     private String proxyOperatorOpenId;
+
+    /**
+     * 简称
+     */
+    private String abbreviation;
 }

happy-boot-module-flexjob/src/main/resources/application-dev.yml

@@ -174,47 +174,47 @@ jeecg :
     #产品2——电签
     ess:
       #电签应用id
-      appId: 'yDRslUUsu69shUE3TCX5RM3g76bzEFA8'
+      appId: 'yDw9iUUtdt09fUE0wP9uxlzt0BnwJmCE'
       #渠道商
       channel[0]:
         #渠道/平台合作企业的企业名称
         proxyOrganizationName: '江西盛宁科技有限公司'
         #腾讯电子签颁发给渠道侧合作企业的应用ID
-        proxyAppId: 'yDRslUUsu4eyxUE3TCX5vhrGItTWFvFC'
+        proxyAppId: ''
         #渠道/平台合作企业的企业ID
-        proxyOrganizationOpenId: '10001659-zike0001'
+        proxyOrganizationOpenId: '10001660-zike0001'
         #渠道/平台合作企业经办人（操作员）ID
-        proxyOperatorOpenId: 'legalPersonOpenId_obLsS5Y0ySNtInkx4a-MO8ovhRhE'
+        proxyOperatorOpenId: 'channel-super-admin-openId0002'
         #电签模板id
-        templateId: 'yDRsfUU1qgs7jUy5k74WEHwMVIw6c0M8'
+        templateId: ''
       channel[1]:
         #渠道/平台合作企业的企业名称
         proxyOrganizationName: '江西升酬宝网络科技有限公司'
         #腾讯电子签颁发给渠道侧合作企业的应用ID
-        proxyAppId: 'yDRslUUsu6xe2UE3TCX5u1nzKPxxteav'
+        proxyAppId: 'yDwcbUUkiyipbUE3TCX5uNJ18lzn1Tcu'
         #渠道/平台合作企业的企业ID
-        proxyOrganizationOpenId: '10001659-zike0002'
+        proxyOrganizationOpenId: '10001660-zike0002'
         #渠道/平台合作企业经办人（操作员）ID
         proxyOperatorOpenId: 'channel-super-admin-openId0002'
         #电签模板id
-        templateId: 'yDwcGUUkvwxl4UxN2ON08JY1Cv1n16rR'
+        templateId: 'yDwnGUUtj9n40Uxzm2u71IMLjw3wmjt1'
       channel[2]:
         #渠道/平台合作企业的企业名称
         proxyOrganizationName: '江苏开心工作科技有限公司'
         #腾讯电子签颁发给渠道侧合作企业的应用ID
         proxyAppId: ''
         #渠道/平台合作企业的企业ID
-        proxyOrganizationOpenId: '10001659-zike0003'
+        proxyOrganizationOpenId: '10001660-zike0003'
         #渠道/平台合作企业经办人（操作员）ID
         proxyOperatorOpenId: 'channel-super-admin-openId0003'
         #电签模板id
-        templateId: 'yDR1dUUgygj77pptUuO4zjEETbXNXDPx'
+        templateId: ''
       #API域名
       endPoint: 'essbasic.tencentcloudapi.com'
       #文件服务域名
       fileServiceEndPoint: 'file.ess.tencent.cn'
       #回调解密key
-      callbackUrlKey: '2C9679714A54456493B225D9386835A2'
+      callbackUrlKey: 'E9700E33258241188044F99084B0680A'
       #文件路径
       fileBaseDir: '/mnt/product/happywork/ess/'
     #产品3——短信

happy-boot-module-flexjob/src/main/resources/application-prod.yml

@@ -168,30 +168,30 @@ jeecg :
     #产品2——电签
     ess:
       #电签应用id
-      appId: 'yDRslUUsu69shUE3TCX5RM3g76bzEFA8'
+      appId: ''
       #渠道商
       channel[0]:
         #渠道/平台合作企业的企业名称
         proxyOrganizationName: '江西盛宁科技有限公司'
         #腾讯电子签颁发给渠道侧合作企业的应用ID
-        proxyAppId: 'yDRslUUsu4eyxUE3TCX5vhrGItTWFvFC'
+        proxyAppId: ''
         #渠道/平台合作企业的企业ID
-        proxyOrganizationOpenId: '10001659-zike0001'
+        proxyOrganizationOpenId: '10001660-zike0001'
         #渠道/平台合作企业经办人（操作员）ID
-        proxyOperatorOpenId: 'legalPersonOpenId_obLsS5Y0ySNtInkx4a-MO8ovhRhE'
+        proxyOperatorOpenId: 'channel-super-admin-openId0001'
         #电签模板id
-        templateId: 'yDRsfUU1qgs7jUy5k74WEHwMVIw6c0M8'
+        templateId: ''
       channel[1]:
         #渠道/平台合作企业的企业名称
         proxyOrganizationName: '江西升酬宝网络科技有限公司'
         #腾讯电子签颁发给渠道侧合作企业的应用ID
-        proxyAppId: 'yDRslUUsu6xe2UE3TCX5u1nzKPxxteav'
+        proxyAppId: ''
         #渠道/平台合作企业的企业ID
-        proxyOrganizationOpenId: '10001659-zike0002'
+        proxyOrganizationOpenId: '10001660-zike0002'
         #渠道/平台合作企业经办人（操作员）ID
         proxyOperatorOpenId: 'channel-super-admin-openId0002'
         #电签模板id
-        templateId: 'yDwcGUUkvwxl4UxN2ON08JY1Cv1n16rR'
+        templateId: ''
       channel[2]:
         #渠道/平台合作企业的企业名称
         proxyOrganizationName: '江苏开心工作科技有限公司'
@@ -202,7 +202,7 @@ jeecg :
         #渠道/平台合作企业经办人（操作员）ID
         proxyOperatorOpenId: 'channel-super-admin-openId0003'
         #电签模板id
-        templateId: 'yDR1dUUgygj77pptUuO4zjEETbXNXDPx'
+        templateId: ''
       #API域名
       endPoint: 'essbasic.tencentcloudapi.com'
       #文件服务域名

happy-boot-module-flexjob/src/main/resources/application-test.yml

@@ -171,47 +171,47 @@ jeecg :
     #产品2——电签
     ess:
       #电签应用id
-      appId: 'yDRslUUsu69shUE3TCX5RM3g76bzEFA8'
+      appId: 'yDw9iUUtdt09fUE0wP9uxlzt0BnwJmCE'
       #渠道商
       channel[0]:
         #渠道/平台合作企业的企业名称
         proxyOrganizationName: '江西盛宁科技有限公司'
         #腾讯电子签颁发给渠道侧合作企业的应用ID
-        proxyAppId: 'yDRslUUsu4eyxUE3TCX5vhrGItTWFvFC'
+        proxyAppId: ''
         #渠道/平台合作企业的企业ID
-        proxyOrganizationOpenId: '10001659-zike0001'
+        proxyOrganizationOpenId: '10001660-zike0001'
         #渠道/平台合作企业经办人（操作员）ID
-        proxyOperatorOpenId: 'legalPersonOpenId_obLsS5Y0ySNtInkx4a-MO8ovhRhE'
+        proxyOperatorOpenId: 'channel-super-admin-openId0002'
         #电签模板id
-        templateId: 'yDRsfUU1qgs7jUy5k74WEHwMVIw6c0M8'
+        templateId: ''
       channel[1]:
         #渠道/平台合作企业的企业名称
         proxyOrganizationName: '江西升酬宝网络科技有限公司'
         #腾讯电子签颁发给渠道侧合作企业的应用ID
-        proxyAppId: 'yDRslUUsu6xe2UE3TCX5u1nzKPxxteav'
+        proxyAppId: 'yDwcbUUkiyipbUE3TCX5uNJ18lzn1Tcu'
         #渠道/平台合作企业的企业ID
-        proxyOrganizationOpenId: '10001659-zike0002'
+        proxyOrganizationOpenId: '10001660-zike0002'
         #渠道/平台合作企业经办人（操作员）ID
         proxyOperatorOpenId: 'channel-super-admin-openId0002'
         #电签模板id
-        templateId: 'yDwcGUUkvwxl4UxN2ON08JY1Cv1n16rR'
+        templateId: 'yDwnGUUtj9n40Uxzm2u71IMLjw3wmjt1'
       channel[2]:
         #渠道/平台合作企业的企业名称
         proxyOrganizationName: '江苏开心工作科技有限公司'
         #腾讯电子签颁发给渠道侧合作企业的应用ID
         proxyAppId: ''
         #渠道/平台合作企业的企业ID
-        proxyOrganizationOpenId: '10001659-zike0003'
+        proxyOrganizationOpenId: '10001660-zike0003'
         #渠道/平台合作企业经办人（操作员）ID
         proxyOperatorOpenId: 'channel-super-admin-openId0003'
         #电签模板id
-        templateId: 'yDR1dUUgygj77pptUuO4zjEETbXNXDPx'
+        templateId: ''
       #API域名
       endPoint: 'essbasic.tencentcloudapi.com'
       #文件服务域名
       fileServiceEndPoint: 'file.ess.tencent.cn'
       #回调解密key
-      callbackUrlKey: '2C9679714A54456493B225D9386835A2'
+      callbackUrlKey: 'E9700E33258241188044F99084B0680A'
       #文件路径
       fileBaseDir: '/mnt/product/happywork/ess/'
     #产品3——短信