1125需要变更

easydo-chengfa/src/main/java/easydo/technology/controller/GLDMasterController.java

@@ -1,9 +1,16 @@
 package easydo.technology.controller;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import easydo.technology.annotation.WebLog;
 import easydo.technology.components.JdbcClient;
 import easydo.technology.model.ApproveInfo;
+import easydo.technology.model.GldDept;
+import easydo.technology.model.GldMember;
+import easydo.technology.model.SysUser;
+import easydo.technology.service.GLDApproveService;
 import easydo.technology.service.GLDMasterService;
+import easydo.technology.utils.StringUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -15,14 +22,19 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
 import javax.sql.DataSource;
 import java.sql.Connection;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/gldMaster")
 public class GLDMasterController {
     @Resource
     GLDMasterService gldMasterService;
+    @Resource
+    GLDApproveService gldApproveService;
     @Value("${GLD.APPROVE.mgtGroupId}")
     String mgtGroupId;
     @Value("${tenantId_gld_master}")
@@ -69,4 +81,44 @@ public class GLDMasterController {
         gldMasterService.removeToken();
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @WebLog
+    @RequestMapping("/getUserDeptList")
+    public Object getUserDeptList(@RequestBody SysUser user) throws Exception {
+        if (StringUtil.isEmpty(user.getPhone())) {
+            throw new Exception("参数错误");
+        }
+
+        Connection connection = null;
+        try {
+            connection = dataSource.getConnection();
+
+            GldMember gldMember = new GldMember();
+            gldMember.setPhone(user.getPhone());
+            gldMember.setActive(true);
+            gldMember.setEnabled(true);
+            gldMember = jdbcClient.getJdbcModel(gldMember, connection);
+
+            if (StringUtil.isEmpty(gldMember.getId())) {
+                throw new Exception("手机号参数错误或缺失");
+            }
+
+            JSONArray list = gldApproveService.getUserDeptList(gldMember.getUserId());
+            List<GldDept> deptList = new ArrayList<>();
+            for (Object object : list) {
+                JSONObject obj = (JSONObject) object;
+                Long deptId = obj.getLong("deptId");
+                GldDept gldDept = new GldDept();
+                gldDept.setId(deptId.toString());
+                gldDept = jdbcClient.getJdbcModel(gldDept, connection);
+                deptList.add(gldDept);
+            }
+            deptList = deptList.stream().filter(model->!"内部单位".equals(model.getName())).collect(Collectors.toList());
+            return new ResponseEntity<>(deptList, HttpStatus.OK);
+        } catch (Exception e) {
+            throw e;
+        } finally {
+            jdbcClient.finallyExecute(connection);
+        }
+    }
 }

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseAnswerSignController.java

@@ -86,6 +86,7 @@ public class PurchaseAnswerSignController {
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_ANSWER_SIGN.getValue());
             vo.setTemplateId(model.getTemplateId());
             vo.setUserTaskAssigneePropsList(model.getUserTaskAssigneePropsList());
+            vo.setExtData(model.getExtData());
             String taskId = gldApproveService.startApprove(vo);
             vo.setTaskId(taskId);
             vo = gldApproveService.getApproveInfo(vo);

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseApplyController.java

@@ -148,6 +148,7 @@ public class PurchaseApplyController {
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE.getValue());
             vo.setTemplateId(model.getTemplateId());
             vo.setUserTaskAssigneePropsList(model.getUserTaskAssigneePropsList());
+            vo.setExtData(model.getExtData());
             String taskId = gldApproveService.startApprove(vo);
             vo.setTaskId(taskId);
             vo = gldApproveService.getApproveInfo(vo);

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseBidNoticeController.java

@@ -96,6 +96,7 @@ public class PurchaseBidNoticeController {
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_BID_NOTICE.getValue());
             vo.setTemplateId(model.getTemplateId());
             vo.setUserTaskAssigneePropsList(model.getUserTaskAssigneePropsList());
+            vo.setExtData(model.getExtData());
             String taskId = gldApproveService.startApprove(vo);
             vo.setTaskId(taskId);
             vo = gldApproveService.getApproveInfo(vo);

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseBidSignController.java

@@ -85,6 +85,7 @@ public class PurchaseBidSignController {
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_BID_SIGN.getValue());
             vo.setTemplateId(model.getTemplateId());
             vo.setUserTaskAssigneePropsList(model.getUserTaskAssigneePropsList());
+            vo.setExtData(model.getExtData());
             String taskId = gldApproveService.startApprove(vo);
             vo.setTaskId(taskId);
             vo = gldApproveService.getApproveInfo(vo);

easydo-chengfa/src/main/java/easydo/technology/controller/PurchaseMatterController.java

@@ -91,6 +91,7 @@ public class PurchaseMatterController {
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_MATTER.getValue());
             vo.setTemplateId(model.getTemplateId());
             vo.setUserTaskAssigneePropsList(model.getUserTaskAssigneePropsList());
+            vo.setExtData(model.getExtData());
             String taskId = gldApproveService.startApprove(vo);
             vo.setTaskId(taskId);
             vo = gldApproveService.getApproveInfo(vo);

easydo-chengfa/src/main/java/easydo/technology/controller/PurchasePlanController.java

@@ -183,6 +183,7 @@ public class PurchasePlanController {
             vo.setTargetType(ChengfaEnum.BUS_APPROVE_TYPE_PURCHASE_PLAN.getValue());
             vo.setTemplateId(model.getTemplateId());
             vo.setUserTaskAssigneePropsList(model.getUserTaskAssigneePropsList());
+            vo.setExtData(model.getExtData());
             String taskId = gldApproveService.startApprove(vo);
             vo.setTaskId(taskId);
             vo = gldApproveService.getApproveInfo(vo);

easydo-chengfa/src/main/java/easydo/technology/controller/UserProjectRefController.java

@@ -0,0 +1,68 @@
+package easydo.technology.controller;
+
+import easydo.technology.annotation.WebLog;
+import easydo.technology.components.JdbcClient;
+import easydo.technology.model.UserProjectRef;
+import lombok.extern.java.Log;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("/api")
+public class UserProjectRefController {
+    @Resource
+    JdbcClient jdbcClient;
+    @Resource
+    DataSource dataSource;
+
+    @WebLog
+    @RequestMapping(value = "/getList")
+    public Object getList(@RequestBody Map<String, Object> map) throws Exception {
+        Connection connection = null;
+        try {
+            connection = dataSource.getConnection();
+
+            List<UserProjectRef> list = jdbcClient.getJdbcList(map, UserProjectRef.class, connection);
+            return new ResponseEntity<>(list, HttpStatus.OK);
+        } catch (Exception e) {
+            throw e;
+        } finally {
+            jdbcClient.finallyExecute(connection);
+        }
+    }
+
+    @WebLog
+    @RequestMapping(value = "/saveBatch")
+    public Object save(@RequestBody UserProjectRef model) throws Exception {
+        Connection connection = null;
+        try {
+            connection = dataSource.getConnection();
+            connection.setAutoCommit(false);
+
+            jdbcClient.jdbcRemove(model, connection);
+
+            String[] projectIdArr = model.getProjectIds().split(",");
+            for (String projectId : projectIdArr) {
+                UserProjectRef ref = new UserProjectRef();
+                ref.setProjectId(Long.valueOf(projectId));
+                jdbcClient.jdbcInsert(ref, connection);
+            }
+            connection.commit();
+            return new ResponseEntity<>(model, HttpStatus.OK);
+        } catch (Exception e) {
+            connection.rollback();
+            throw e;
+        } finally {
+            jdbcClient.finallyExecute(connection);
+        }
+    }
+}

easydo-chengfa/src/main/java/easydo/technology/model/Purchase.java

@@ -1,6 +1,7 @@
 package easydo.technology.model;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import easydo.technology.annotation.NotTableField;
 import easydo.technology.annotations.ZSFContainer;
 import easydo.technology.annotations.ZSFContainers;
@@ -78,4 +79,6 @@ public class Purchase extends ZeroSpringFolder<Purchase> {
     private PurchaseLaw purchaseLaw;
     @NotTableField
     private JSONArray userTaskAssigneePropsList;
+    @NotTableField
+    private JSONObject extData;
 }

easydo-chengfa/src/main/java/easydo/technology/model/PurchaseAnswerSign.java

@@ -1,6 +1,7 @@
 package easydo.technology.model;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import easydo.technology.annotation.NotTableField;
 import easydo.technology.annotations.ZSFContainer;
 import easydo.technology.annotations.ZSFContainers;
@@ -40,4 +41,6 @@ public class PurchaseAnswerSign extends ZeroSpringFolder<PurchaseAnswerSign> {
     private String templateId;
     @NotTableField
     private JSONArray userTaskAssigneePropsList;
+    @NotTableField
+    private JSONObject extData;
 }

easydo-chengfa/src/main/java/easydo/technology/model/PurchaseBidNotice.java

@@ -3,6 +3,7 @@ package easydo.technology.model;
 import java.math.BigDecimal;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import easydo.technology.annotation.NotTableField;
 import easydo.technology.annotations.ZSFContainer;
 import easydo.technology.annotations.ZSFContainers;
@@ -55,4 +56,6 @@ public class PurchaseBidNotice extends ZeroSpringFolder<PurchaseBidNotice> {
     private String contractPlanName;
     @NotTableField
     private JSONArray userTaskAssigneePropsList;
+    @NotTableField
+    private JSONObject extData;
 }

easydo-chengfa/src/main/java/easydo/technology/model/PurchaseBidSign.java

@@ -1,6 +1,7 @@
 package easydo.technology.model;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import easydo.technology.annotation.NotTableField;
 import easydo.technology.annotations.ZSFContainer;
 import easydo.technology.annotations.ZSFContainers;
@@ -40,4 +41,6 @@ public class PurchaseBidSign extends ZeroSpringFolder<PurchaseBidSign> {
     private String templateId;
     @NotTableField
     private JSONArray userTaskAssigneePropsList;
+    @NotTableField
+    private JSONObject extData;
 }

easydo-chengfa/src/main/java/easydo/technology/model/PurchaseMatter.java

@@ -1,6 +1,7 @@
 package easydo.technology.model;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import easydo.technology.annotation.NotTableField;
 import easydo.technology.annotations.ZSFContainer;
 import easydo.technology.annotations.ZSFContainers;
@@ -37,4 +38,6 @@ public class PurchaseMatter extends ZeroSpringFolder<PurchaseMatter> {
     private String templateId;
     @NotTableField
     private JSONArray userTaskAssigneePropsList;
+    @NotTableField
+    private JSONObject extData;
 }

easydo-chengfa/src/main/java/easydo/technology/model/PurchasePlan.java

@@ -1,6 +1,7 @@
 package easydo.technology.model;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import easydo.technology.annotation.NotTableField;
 import easydo.technology.annotations.ZSFContainer;
 import easydo.technology.annotations.ZSFContainers;
@@ -55,4 +56,6 @@ public class PurchasePlan extends ZeroSpringFolder<PurchasePlan> {
     private String templateId;
     @NotTableField
     private JSONArray userTaskAssigneePropsList;
+    @NotTableField
+    private JSONObject extData;
 }

easydo-chengfa/src/main/java/easydo/technology/model/UserProjectRef.java

@@ -0,0 +1,14 @@
+package easydo.technology.model;
+
+import easydo.technology.annotation.NotTableField;
+import lombok.Data;
+
+@Data
+public class UserProjectRef {
+    private String id;
+    private Long userId;
+    private Long projectId;
+
+    @NotTableField
+    private String projectIds;
+}

easydo-chengfa/src/main/java/easydo/technology/service/GLDApproveService.java

@@ -38,6 +38,8 @@ public class GLDApproveService {
     String startApprove;
     @Value("${GLD.APPROVE.getApproveInfo}")
     String getApproveInfo;
+    @Value("${GLD.APPROVE.getUserDeptList}")
+    String getUserDeptList;
     @Resource
     JdbcClient jdbcClient;
     @Resource
@@ -82,6 +84,7 @@ public class GLDApproveService {
 //        object.put("targetId", vo.getTargetId());
         object.put("taskType", "APPROVAL");
         object.put("userTaskAssigneePropsList", vo.getUserTaskAssigneePropsList());
+        object.put("extData", vo.getExtData());
         object.put("hiddenResubmit", true);
         object.put("startorId", member.getUserId());
         String uuid = UUID.randomUUID().toString();
@@ -156,6 +159,18 @@ public class GLDApproveService {
         return vo;
     }
 
+    public JSONArray getUserDeptList(String userId) throws Exception {
+        String url = host + getUserDeptList.replace("{userId}", userId);
+        Map<String, String> header = new HashMap<>();
+        header.put("X-CORAL-TENANT", tenantId);
+        header.put("Authorization", authorization);
+        String uuid = UUID.randomUUID().toString();
+        log.info(uuid + "查询用户下所属组织url========>" + url);
+        JSONArray resArray = HttpClientUtil.sendGETWithHeader_Arr(url, header);
+        log.info(uuid + "查询用户下所属组织res========>" + resArray.toJSONString());
+        return resArray;
+    }
+
 //    public static void main(String[] args) {
 ////        String url = "http://218.201.101.181:14780/task/tasks?targetId=89bfac89-7fd5-4c1f-a386-f2f36efafb1d&targetType=purchase_plan";
 //        String url = "http://218.201.101.181:14780/task/11200297/tasks?ids=22175528771584&taskType=APPROVAL";

easydo-chengfa/src/main/resources/config/application-prod.yml

@@ -187,6 +187,7 @@ GLD:
     mgtGroupId: "5600164"
     startApprove: "/task/{deptId}/tasks/submit"
     getApproveInfo: "/task/{deptId}/tasks?ids={ids}&taskType=APPROVAL"
+    getUserDeptList: "/admin/depts/members/userId/{userId}"
     authorization: "Basic YlFvc0tIeWJkSlZUZGtMcXA0U1VIMlE0ejNZQjc5eVA6b1ZmaU5zR1c1NVZzSW5ITTlDOVI3c2g0SHlpVGMxY2w="
 
 PURCHASE: