上传承揽合同

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/controller/HlgUserSubcontractController.java

@@ -140,11 +140,11 @@ public class HlgUserSubcontractController {
 	public Result<HlgUserSubcontract> add(@RequestBody HlgUserSubcontract hlgUserSubcontract) {
 		Result<HlgUserSubcontract> result = new Result<HlgUserSubcontract>();
 		try {
-			hlgUserSubcontractService.saveUserSubContract(hlgUserSubcontract);
-			result.success("添加成功！");
+			String msg=hlgUserSubcontractService.saveUserSubContract(hlgUserSubcontract);
+			Result.ok(msg);
 		} catch (Exception e) {
 			log.error(e.getMessage(),e);
-			result.error500("操作失败");
+			result.error500(e.getMessage());
 		}
 		return result;
 	}

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/entity/HlgUserSubcontract.java

@@ -41,7 +41,7 @@ public class HlgUserSubcontract implements Serializable {
     @Excel(name = "服务商", width = 15)
     private Integer subcontractorId;
     /**
-     * 承揽合同
+     * 承揽合同(弃用)
      */
     @Excel(name = "承揽合同", width = 15)
     private String subcontract;
@@ -70,4 +70,24 @@ public class HlgUserSubcontract implements Serializable {
      */
     @TableField(exist = false)
     private Integer orderId;
+
+
+    /**
+     * 承揽合同
+     */
+    @Excel(name = "承揽合同", width = 15)
+    private String workContract;
+
+
+    /**合同开始时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date startDate;
+    /**合同结束时间*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private Date endDate;
+
+    private Integer contractId;
+
 }

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/service/IHlgUserSubcontractService.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 public interface IHlgUserSubcontractService extends IService<HlgUserSubcontract> {
 
-    void saveUserSubContract(HlgUserSubcontract hlgUserSubcontract);
+    String saveUserSubContract(HlgUserSubcontract hlgUserSubcontract);
 
     int getCountByUserContract(HlgPlatformSubcontractor hlgPlatformSubcontractor);
 

happy-boot-module-powerjob/src/main/java/org/jeecg/modules/hlguser/service/impl/HlgUserSubcontractServiceImpl.java

@@ -41,7 +41,7 @@ public class HlgUserSubcontractServiceImpl extends ServiceImpl<HlgUserSubcontrac
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void saveUserSubContract(HlgUserSubcontract hlgUserSubcontract) {
+    public String saveUserSubContract(HlgUserSubcontract hlgUserSubcontract) {
         //获取当前登录用户
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         //获取用户所在平台的orgCode
@@ -51,9 +51,13 @@ public class HlgUserSubcontractServiceImpl extends ServiceImpl<HlgUserSubcontrac
         String accessToken = OauthTokenUtils.getDayAccessToken();
         String requestUrl = OauthApi.orderUploadUserContract;
         Map<String, Object> parameters = new HashMap<>();
-        parameters.put("idcardNumber", hlgUser.getIdcardNumber());
+        parameters.put("userCode", hlgUser.getUserCode());
         parameters.put("subcontractorId", hlgUserSubcontract.getSubcontractorId());
-        parameters.put("subcontract", hlgUserSubcontract.getSubcontract());
+        parameters.put("workContract", hlgUserSubcontract.getWorkContract());
+        parameters.put("startDate", hlgUserSubcontract.getStartDate());
+        parameters.put("endDate", hlgUserSubcontract.getEndDate());
+        parameters.put("createBy", sysUser.getUsername());
+        parameters.put("contractId", hlgUserSubcontract.getContractId());
         log.info("param============{}", JSONObject.toJSONString(parameters));
         //数据加密
         String biz_content = CryptTool.encode(JSONObject.toJSONString(parameters));
@@ -62,9 +66,12 @@ public class HlgUserSubcontractServiceImpl extends ServiceImpl<HlgUserSubcontrac
         if (jsonObject != null) {
             if (jsonObject.getBoolean("success")) {
                 log.info("上传承揽合同成功===={}", jsonObject);
+                String msg=jsonObject.getString("message");
+                return msg;
             } else {
+                String msg=jsonObject.getString("message");
                 //抛出异常，事务回滚
-                throw new JeecgBootException("上传承揽合同失败");
+                throw new JeecgBootException(msg);
             }
         } else {
             throw new JeecgBootException("上传承揽合同失败");