接口—新增“批量上传承揽合同”

happy-cloud-auth/src/main/java/org/jeecg/modules/api/controller/HlwOrderController.java

@@ -63,6 +63,27 @@ public class HlwOrderController {
     }
 
     /**
+     * 批量上传承揽合同
+     *
+     * @param json
+     * @return
+     */
+    @AutoLog(value = "批量上传承揽合同")
+    @ApiOperation(value = "批量上传承揽合同", notes = "批量上传承揽合同")
+    @PostMapping(value = "/batchUploadUserContract")
+    public Result<?> batchUploadUserContract(@RequestBody String json) {
+        log.info("json========{}", json);
+        //数据解密
+        json = CryptTool.decode(json);
+        JSONObject jsonObject = JSONObject.parseObject(json);
+        //获取应用信息
+        OauthApplication oauthApplication = authService.getApplication(SecurityUtils.getClient());
+        jsonObject.put("applicationId", oauthApplication.getApplicationId());
+        Result<?> result = hlwOrderServiceClient.batchUploadUserContract(jsonObject);
+        return result;
+    }
+
+    /**
      * 上传用户合同-订单
      *
      * @param json

happy-cloud-auth/src/main/java/org/jeecg/modules/feign/client/HlwOrderServiceClient.java

@@ -31,6 +31,15 @@ public interface HlwOrderServiceClient {
     Result<?> uploadUserContract(JSONObject jsonObject);
 
     /**
+     * 批量上传承揽合同
+     *
+     * @param jsonObject
+     * @return
+     */
+    @PostMapping(value = "/wisdom/hlwOrder/api/batchUploadUserContract")
+    Result<?> batchUploadUserContract(JSONObject jsonObject);
+
+    /**
      * 上传用户合同
      *
      * @param jsonObject

happy-cloud-auth/src/main/java/org/jeecg/modules/feign/client/fallback/HlwOrderServiceClientFallbackImpl.java

@@ -25,6 +25,11 @@ public class HlwOrderServiceClientFallbackImpl implements HlwOrderServiceClient
     }
 
     @Override
+    public Result<?> batchUploadUserContract(JSONObject jsonObject) {
+        return Result.error("上传承揽合同失败");
+    }
+
+    @Override
     public Result<?> uploadWorkContract(JSONObject jsonObject) {
         return Result.error("上传用户合同失败");
     }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/api/controller/HlwOrderApiController.java

@@ -13,7 +13,6 @@ import org.jeecg.modules.hlworder.entity.HlwOrder;
 import org.jeecg.modules.hlworder.entity.HlwRequirement;
 import org.jeecg.modules.hlworder.service.IHlwOrderService;
 import org.jeecg.modules.hlworder.service.IHlwRequirementService;
-import org.jeecg.modules.hlwpayment.entity.HlwPayment;
 import org.jeecg.modules.hlwsubcontractor.entity.HlwSubcontractor;
 import org.jeecg.modules.hlwsubcontractor.service.IHlwSubcontractorService;
 import org.jeecg.modules.hlwuser.entity.HlwUser;
@@ -30,7 +29,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.time.LocalDate;
-import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -116,6 +114,20 @@ public class HlwOrderApiController extends JeecgController<HlwOrder, IHlwOrderSe
     }
 
     /**
+     * 批量上传承揽合同
+     *
+     * @param jsonObject
+     * @return
+     */
+    @AutoLog(value = "批量上传承揽合同")
+    @ApiOperation(value = "批量上传承揽合同", notes = "批量上传承揽合同")
+    @PostMapping(value = "/batchUploadUserContract")
+    public Result<?> batchUploadUserContract(@RequestBody JSONObject jsonObject) {
+        Result<?> result = hlwOrderService.batchUploadUserContract(jsonObject);
+        return result;
+    }
+
+    /**
      * 上传用户合同
      *
      * @param jsonObject

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlworder/service/IHlwOrderService.java

@@ -34,4 +34,6 @@ public interface IHlwOrderService extends IService<HlwOrder> {
     List<HlwOrder> queryOrderListNoPage(List<String> companyCodeList, HlwOrder hlwOrder, Integer applicationId);
 
     void saveOrderMany(List<Map<String,Object>> orderlist);
+
+    Result<?> batchUploadUserContract(JSONObject jsonObject);
 }

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/hlworder/service/impl/HlwOrderServiceImpl.java

@@ -12,6 +12,7 @@ import org.jeecg.modules.hlworder.service.IHlwOrderService;
 import org.jeecg.modules.hlworder.service.IHlwRequirementService;
 import org.jeecg.modules.hlwuser.entity.HlwUser;
 import org.jeecg.modules.hlwuser.entity.HlwUserSubcontractor;
+import org.jeecg.modules.hlwuser.service.IHlwUserService;
 import org.jeecg.modules.hlwuser.service.IHlwUserSubcontractorService;
 import org.jeecg.modules.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,8 @@ public class HlwOrderServiceImpl extends ServiceImpl<HlwOrderMapper, HlwOrder> i
     private IHlwUserSubcontractorService hlwUserSubcontractorService;
     @Autowired
     private IHlwRequirementService hlwRequirementService;
+    @Autowired
+    private IHlwUserService hlwUserService;
 
     @Override
     public List<HlwOrder> getList(String idcardNumber, Integer subcontractorId, Integer applicationId) {
@@ -158,7 +161,6 @@ public class HlwOrderServiceImpl extends ServiceImpl<HlwOrderMapper, HlwOrder> i
                 hlwUserSubcontractorDto.setIsAutoRenew(isAutoRenew);
                 hlwUserSubcontractorService.save(hlwUserSubcontractorDto);
             }
-
         }
         return Result.ok("批量上传用户合同成功");
     }
@@ -225,4 +227,45 @@ public class HlwOrderServiceImpl extends ServiceImpl<HlwOrderMapper, HlwOrder> i
             saveBatch(list);
         }
     }
+
+    /**
+     * 批量上传承揽合同
+     *
+     * @param jsonObject
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result<?> batchUploadUserContract(JSONObject jsonObject) {
+        JSONArray syncList = jsonObject.getJSONArray("syncList");
+        for (int i = 0; i < syncList.size(); i++) {
+            JSONObject jsonObjectNew = syncList.getJSONObject(i);
+            Integer subcontractorId = jsonObjectNew.getInteger("subcontractorId");
+            String userCode = jsonObjectNew.getString("userCode");
+            String workContract = jsonObjectNew.getString("workContract");
+            Date startDate = jsonObjectNew.getDate("startDate");
+            Integer isAutoRenew = jsonObjectNew.getInteger("isAutoRenew");
+            Date endDate = jsonObject.getDate("endDate");
+            //查询user_id、subcontractorId的订单（hlw_user_subcontractor）
+            HlwUser hlwUser = hlwUserService.getByUserCode(userCode);
+            QueryWrapper<HlwUserSubcontractor> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("user_id", hlwUser.getId());
+            queryWrapper.eq("subcontractor_id", subcontractorId);
+            HlwUserSubcontractor hlwUserSubcontractor = hlwUserSubcontractorService.getOne(queryWrapper);
+            if (hlwUserSubcontractor != null) {
+                hlwUserSubcontractor.setWorkContract(workContract);
+                hlwUserSubcontractorService.updateById(hlwUserSubcontractor);
+            } else {
+                HlwUserSubcontractor hlwUserSubcontractorDto = new HlwUserSubcontractor();
+                hlwUserSubcontractorDto.setUserId(hlwUser.getId());
+                hlwUserSubcontractorDto.setSubcontractorId(subcontractorId);
+                hlwUserSubcontractorDto.setWorkContract(workContract);
+                hlwUserSubcontractorDto.setStartDate(startDate);
+                hlwUserSubcontractorDto.setEndDate(endDate);
+                hlwUserSubcontractorDto.setIsAutoRenew(isAutoRenew);
+                hlwUserSubcontractorService.save(hlwUserSubcontractorDto);
+            }
+        }
+        return Result.ok("批量上传承揽合同成功");
+    }
 }