更新

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/entity/JgUseRegistration.java

@@ -155,4 +155,7 @@ public class JgUseRegistration extends BaseEntity {
 
     @TableField("inspect_unit_credit_code")
     private String inspectUnitCreditCode;
+
+    @TableField("instance_status")
+    private String instanceStatus;
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/UseStatusEnum.java

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 使用登记状态西悉尼
+ */
+@Getter
+@AllArgsConstructor
+public enum UseStatusEnum {
+
+    SUBMIT("使用单位提交", "submit", "使用单位待提交"),
+    RECEIVE("一级受理", "receive", "一级受理待受理"),
+    PRELIMINARY("二级受理", "preliminary", "二级受理待受理"),
+    REEXAMINE("三级受理", "reexamine", "三级受理待受理");
+
+
+
+    private final String name;
+
+    private final String code;
+
+    private final String pass;
+
+
+
+    public static UseStatusEnum getMessage(String name){
+        for (UseStatusEnum constants : values()) {
+            if (constants.getName().equals(name)) {
+                return constants;
+            }
+        }
+        return null;
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/flc/api/fegin/WorkFlowFeginService.java → amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/flc/api/fegin/WorkFlowFeignService.java

@@ -14,9 +14,9 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.Map;
 
-//@FeignClient(value = "AMOS-API-WORKFLOW", configuration = {FeignConfiguration.class})
+
 @FeignClient(name = "AMOS-API-WORKFLOW", path = "workflow", configuration = {MultipartSupportConfig.class})
-public interface WorkFlowFeginService {
+public interface WorkFlowFeignService {
 
     /***
      * 根据task_id 获取节点信息
@@ -64,5 +64,9 @@ public interface WorkFlowFeginService {
             @PathVariable(value = "processInstanceId") String processInstanceId);
 
 
+    @RequestMapping(value = "/v2/task/rollBack/{processInstanceId}", method = RequestMethod.POST)
+    JSONObject rollBack(@PathVariable(value = "processInstanceId") String processInstanceId);
+
+
 
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgUseRegistrationMapper.xml

@@ -14,7 +14,10 @@
         jri.PRODUCT_NAME as productName,
         jri.EQU_CODE as equCode,
         use.USE_INNER_CODE as innerCode,
-        concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place
+        concat(use.PROVINCE_NAME,'-',use.CITY_NAME,'-',use.COUNTY_NAME) as place,
+        ur.instance_id as instanceId,
+        re.equip_id as equipId,
+        ur.apply_no as applyNo
         from tzs_jg_use_registration ur
         LEFT JOIN tzs_jg_relation_equip re  on ur.sequence_nbr = re.business_id
         LEFT JOIN idx_biz_jg_register_info jri  on re.equip_id = jri.RECORD
@@ -35,12 +38,16 @@
                 and  ur.use_unit_name like concat('%',#{dto.useUnitName},'%')
             </if>
         </where>
+            order by ur.rec_date desc
     </select>
     <select id="getDetail" resultType="java.util.Map">
         SELECT jri.EQU_CODE                                                           as equCode,
-                     (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
-                     (SELECT name from tz_equipment_category where code = jri.EQU_LIST)     as equList,
-                     (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE)   as equDefine,
+--                      (SELECT name from tz_equipment_category where code = jri.EQU_CATEGORY) as equCategory,
+--                      (SELECT name from tz_equipment_category where code = jri.EQU_LIST)     as equList,
+--                      (SELECT name from tz_equipment_category where code = jri.EQU_DEFINE)   as equDefine,
+                     jri.EQU_CATEGORY  as equCategory,
+                     jri.EQU_LIST as equList,
+                     jri.EQU_DEFINE as equDefine,
                      jri.PRODUCT_NAME                                                       as productName,
                      jri.EQU_TYPE                                                           as equType,
                      jri.PRODUCT_PHOTO                                                      as proDuctPhoto,
@@ -84,7 +91,8 @@
                ADDRESS as address,
                PROVINCE as province,
                CITY as city,
-               COUNTY as county
+               COUNTY as county,
+               USE_INNER_CODE as useInnerCode
         FROM "idx_biz_jg_use_info"  where RECORD = #{id}
     </select>
     <select id="getEquipListPage" resultType="java.util.Map">

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgUseRegistrationController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
+import com.yeejoin.amos.boot.module.jg.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl;
-import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeginService;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.workflow.Workflow;
-import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
-import com.yeejoin.amos.feign.workflow.model.AjaxResult;
-import com.yeejoin.amos.feign.workflow.model.TaskResultDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -48,6 +45,22 @@ public class JgUseRegistrationController extends BaseController {
         return ResponseHelper.buildResponse("ok");
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/flowExecute")
+    @ApiOperation(httpMethod = "POST", value = "执行流程", notes = "执行流程")
+    public ResponseModel<Object> flowExecute(@RequestBody JSONObject map) {
+        jgUseRegistrationServiceImpl.flowExecute(String.valueOf(map.get("instanceId")), String.valueOf(map.get("operate")), String.valueOf(map.get("comment")), true);
+        return ResponseHelper.buildResponse("ok");
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/withdraw")
+    @ApiOperation(httpMethod = "POST", value = "撤回", notes = "撤回")
+    public ResponseModel<Object> withdraw(@RequestBody JSONObject map) {
+        jgUseRegistrationServiceImpl.withdraw(String.valueOf(map.get("instanceId")));
+        return ResponseHelper.buildResponse("ok");
+    }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/deleteBatch")
@@ -98,61 +111,16 @@ public class JgUseRegistrationController extends BaseController {
         return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDetail(id));
     }
 
-@Autowired
-    WorkFlowFeginService workFlowFeginService;
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/test")
-    @ApiOperation(httpMethod = "GET", value = "", notes = "")
-    public ResponseModel test(@RequestParam("op") String op) {
-        String instanceId = "";
-        //启动流程
-        try {
-            ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-            dto.setProcessDefinitionKey("useRegistration");
-            dto.setBusinessKey("1");
-            AjaxResult ajaxResult = Workflow.taskClient.startByVariable(dto);
-            instanceId = ((Map) ajaxResult.get("data")).get("id").toString();
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return ResponseHelper.buildResponse(instanceId);
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @GetMapping(value = "/getMessage")
+    public ResponseModel<Map<String, Object>> getMessage() {
+        ReginParams selectedOrgInfo = getSelectedOrgInfo();
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("useUnitCreditCode", selectedOrgInfo.getCompany().getCompanyCode());
+        map.put("useUnitName", selectedOrgInfo.getCompany().getCompanyName());
+        return ResponseHelper.buildResponse(map);
     }
 
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @GetMapping(value = "/test1")
-    @ApiOperation(httpMethod = "GET", value = "", notes = "")
-    public void overProjectFlowExecute(@RequestParam("op") String op, @RequestParam("instanceId") String instanceId) {
-
-        try {
-            AjaxResult ajaxResult = Workflow.taskClient.getTask(instanceId);
-            JSONObject dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
-            String taskId = dataObject.getString("id");
-//            JSONObject taskNoAuth = workFlowFeginService.getTaskNoAuth(instanceId);
-//            FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(taskId);
-
-            //组装信息
-            TaskResultDTO dto = new TaskResultDTO();
-//            dto.setResult(op);
-            dto.setResultCode("approvalStatus");
-            dto.setTaskId(taskId);
-            dto.setComment("啦啦啦啦！！！！！");
-            HashMap<String, Object> map = new HashMap<>();
-            map.put("approvalStatus", op);
-            dto.setVariable(map);
-//            FeignClientResult reject = Workflow.taskV2Client.reject(taskId, dto);
-            //执行流程
-            AjaxResult ajaxResult1 = Workflow.taskClient.completeByTask(taskId, dto);
-
-            if (ObjectUtils.isEmpty(ajaxResult1)) {
-
-            }
-
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
 }