approve

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

@@ -8,12 +8,11 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
 
+import com.alibaba.fastjson.JSONObject;
 import easydo.technology.exception.BizException;
+import easydo.technology.model.SysUser;
 import org.springframework.security.crypto.password.PasswordEncoder;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import easydo.technology.annotation.WebLog;
 import easydo.technology.components.JdbcClient;
@@ -105,6 +104,19 @@ public class TestController {
         return "success";
     }
 
+    @WebLog
+    @RequestMapping(value = "/getPassword")
+    public Object getPage(@RequestBody SysUser user) throws Exception {
+//        redisUtils.set("test", "123456", 600);
+//        log.info(redisUtils.get("test").toString());
+//        if(true){
+//            throw new BizException("122345678");
+//        }
+        JSONObject object = new JSONObject();
+        object.put("password", passwordEncoder.encode(user.getUsername()));
+        return object;
+    }
+
     @WebLog
     @GetMapping(value = "/test")
     public void test(HttpServletResponse response, HttpServletRequest request, @RequestParam String objectId,

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

@@ -61,7 +61,7 @@ public class GLDApproveService {
         object.put("startPosName", formName);
         object.put("templateId", vo.getTemplateId());
         object.put("targetType", vo.getTargetType());
-        object.put("targetId", vo.getTargetId());
+//        object.put("targetId", vo.getTargetId());
         object.put("taskType", "APPROVAL");
         object.put("hiddenResubmit", true);
         object.put("startorId", member.getUserId());
@@ -91,7 +91,7 @@ public class GLDApproveService {
         object.put("startPosName", formName);
         object.put("templateId", vo.getTemplateId());
         object.put("targetType", vo.getTargetType());
-        object.put("targetId", vo.getTargetId());
+//        object.put("targetId", vo.getTargetId());
         object.put("taskType", "APPROVAL");
         object.put("hiddenResubmit", true);
         object.put("startorId", member.getUserId());
@@ -124,7 +124,7 @@ public class GLDApproveService {
 
     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=11201008&taskType=APPROVAL";
+        String url = "http://218.201.101.181:14780/task/11200297/tasks?ids=22175528771584&taskType=APPROVAL";
         Map<String, String> header = new HashMap<>();
         header.put("X-CORAL-TENANT", "5600003");
         header.put("Authorization", "Basic YlFvc0tIeWJkSlZUZGtMcXA0U1VIMlE0ejNZQjc5eVA6b1ZmaU5zR1c1NVZzSW5ITTlDOVI3c2g0SHlpVGMxY2w=");