加入用户IDbug

java110-db/src/main/resources/mapper/oa/OaWorkflowFormServiceDaoImplMapper.xml

@@ -184,4 +184,11 @@
         )
     </insert>
 
+    <!-- 修改信息 -->
+    <update id="updateOaWorkflowFormData" parameterType="Map">
+        update set ${tableName} t set t.state = #{state}
+        where t.id = #{id}
+    </update>
+
+
 </mapper>

java110-interface/src/main/java/com/java110/intf/oa/IOaWorkflowFormInnerServiceSMO.java

@@ -29,15 +29,14 @@ public interface IOaWorkflowFormInnerServiceSMO {
     public int saveOaWorkflowForm(@RequestBody OaWorkflowFormPo oaWorkflowFormPo);
 
     @RequestMapping(value = "/updateOaWorkflowForm", method = RequestMethod.POST)
-    public int updateOaWorkflowForm(@RequestBody  OaWorkflowFormPo oaWorkflowFormPo);
+    public int updateOaWorkflowForm(@RequestBody OaWorkflowFormPo oaWorkflowFormPo);
 
     @RequestMapping(value = "/deleteOaWorkflowForm", method = RequestMethod.POST)
-    public int deleteOaWorkflowForm(@RequestBody  OaWorkflowFormPo oaWorkflowFormPo);
+    public int deleteOaWorkflowForm(@RequestBody OaWorkflowFormPo oaWorkflowFormPo);
 
     /**
      * <p>查询小区楼信息</p>
      *
-     *
      * @param oaWorkflowFormDto 数据对象分享
      * @return OaWorkflowFormDto 对象数据
      */
@@ -54,7 +53,7 @@ public interface IOaWorkflowFormInnerServiceSMO {
     int queryOaWorkflowFormsCount(@RequestBody OaWorkflowFormDto oaWorkflowFormDto);
 
     /**
-     *  是否有表
+     * 是否有表
      *
      * @param table 数据对象分享
      * @return 小区下的小区楼记录数
@@ -67,6 +66,7 @@ public interface IOaWorkflowFormInnerServiceSMO {
 
     /**
      * 查询数据总记录数
+     *
      * @param oaWorkflowFormDto
      * @return
      */
@@ -78,8 +78,17 @@ public interface IOaWorkflowFormInnerServiceSMO {
 
     /**
      * 保存表单数据
+     *
      * @param reqJson
      */
     @RequestMapping(value = "/saveOaWorkflowFormData", method = RequestMethod.POST)
     int saveOaWorkflowFormData(@RequestBody JSONObject reqJson);
+
+    /**
+     * 修改表单数据
+     *
+     * @param reqJson
+     */
+    @RequestMapping(value = "/updateOaWorkflowFormData", method = RequestMethod.POST)
+    int updateOaWorkflowFormData(@RequestBody JSONObject reqJson);
 }

service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java

@@ -366,6 +366,7 @@ public class OaWorkflowApi {
         reqJson.put("columns", columns.toArray(new String[columns.size()]));
         reqJson.put("values", columns.toArray(new String[values.size()]));
         reqJson.put("storeId", storeId);
+        reqJson.put("userId", userId);
         return getOaWorkflowFormBMOImpl.saveOaWorkflowFormData(reqJson);
     }
 
@@ -408,13 +409,13 @@ public class OaWorkflowApi {
      */
     @RequestMapping(value = "/queryOaWorkflowUserHisTaskFormData", method = RequestMethod.GET)
     public ResponseEntity<String> queryOaWorkflowUserHisTaskFormData(@RequestHeader(value = "store-id") String storeId,
-                                                                  @RequestHeader(value = "user-id") String userId,
-                                                                  @RequestParam(value = "flowId", required = false) String flowId,
-                                                                  @RequestParam(value = "startTime", required = false) String startTime,
-                                                                  @RequestParam(value = "endTime", required = false) String endTime,
-                                                                  @RequestParam(value = "createUserName", required = false) String createUserName,
-                                                                  @RequestParam(value = "page") int page,
-                                                                  @RequestParam(value = "row") int row) {
+                                                                     @RequestHeader(value = "user-id") String userId,
+                                                                     @RequestParam(value = "flowId", required = false) String flowId,
+                                                                     @RequestParam(value = "startTime", required = false) String startTime,
+                                                                     @RequestParam(value = "endTime", required = false) String endTime,
+                                                                     @RequestParam(value = "createUserName", required = false) String createUserName,
+                                                                     @RequestParam(value = "page") int page,
+                                                                     @RequestParam(value = "row") int row) {
         JSONObject paramIn = new JSONObject();
         paramIn.put("page", page);
         paramIn.put("row", row);
@@ -426,4 +427,26 @@ public class OaWorkflowApi {
         paramIn.put("userId", userId);
         return getOaWorkflowFormBMOImpl.queryOaWorkflowUserHisTaskFormData(paramIn);
     }
+
+    /**
+     * 保存流程数据
+     *
+     * @param storeId 小区ID
+     * @return
+     * @serviceCode /oaWorkflow/auditOaWorkflow
+     * @path /app/oaWorkflow/auditOaWorkflow
+     */
+    @RequestMapping(value = "/auditOaWorkflow", method = RequestMethod.POST)
+    public ResponseEntity<String> auditOaWorkflow(@RequestHeader(value = "store-id") String storeId,
+                                                  @RequestHeader(value = "user-id") String userId,
+                                                  @RequestBody JSONObject reqJson) {
+        Assert.hasKeyAndValue(reqJson, "flowId", "flowId不能为空");
+        Assert.hasKeyAndValue(reqJson, "id", "id不能为空");
+        Assert.hasKeyAndValue(reqJson, "taskId", "任务不能为空");
+        Assert.hasKeyAndValue(reqJson, "auditMessage", "审核意见不能为空");
+        Assert.hasKeyAndValue(reqJson, "auditCode", "审核状态不能为空");
+        reqJson.put("storeId", storeId);
+        reqJson.put("userId", userId);
+        return getOaWorkflowFormBMOImpl.auditOaWorkflow(reqJson);
+    }
 }

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/IGetOaWorkflowFormBMO.java

@@ -39,8 +39,17 @@ public interface IGetOaWorkflowFormBMO {
 
     /**
      * 查询工作流程已办
+     *
      * @param paramIn
      * @return
      */
     ResponseEntity<String> queryOaWorkflowUserHisTaskFormData(JSONObject paramIn);
+
+    /**
+     * 审核 工作流
+     *
+     * @param reqJson
+     * @return
+     */
+    ResponseEntity<String> auditOaWorkflow(JSONObject reqJson);
 }

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflowForm/impl/GetOaWorkflowFormBMOImpl.java

@@ -242,6 +242,33 @@ public class GetOaWorkflowFormBMOImpl implements IGetOaWorkflowFormBMO {
         return responseEntity;
     }
 
+    @Override
+    public ResponseEntity<String> auditOaWorkflow(JSONObject reqJson) {
+        OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();
+        oaWorkflowDto.setStoreId(reqJson.getString("storeId"));
+        oaWorkflowDto.setFlowId(reqJson.getString("flowId"));
+        List<OaWorkflowDto> oaWorkflowDtos = oaWorkflowInnerServiceSMOImpl.queryOaWorkflows(oaWorkflowDto);
+        Assert.listOnlyOne(oaWorkflowDtos, "流程不存在");
+
+        OaWorkflowFormDto oaWorkflowFormDto = new OaWorkflowFormDto();
+        oaWorkflowFormDto.setFlowId(reqJson.get("flowId").toString());
+        oaWorkflowFormDto.setStoreId(reqJson.get("storeId").toString());
+        oaWorkflowFormDto.setRow(1);
+        oaWorkflowFormDto.setPage(1);
+        List<OaWorkflowFormDto> oaWorkflowFormDtos = oaWorkflowFormInnerServiceSMOImpl.queryOaWorkflowForms(oaWorkflowFormDto);
+        Assert.listOnlyOne(oaWorkflowFormDtos, "未包含流程表单，请先设置表单");
+
+
+        reqJson.put("createUserId", reqJson.getString("userId"));
+        boolean isLastTask = oaWorkflowUserInnerServiceSMOImpl.completeTask(reqJson);
+        if (isLastTask) {
+            reqJson.put("state", "1005");
+            reqJson.put("tableName", oaWorkflowFormDtos.get(0).getTableName());
+            oaWorkflowFormInnerServiceSMOImpl.updateOaWorkflowFormData(reqJson);
+        }
+        return ResultVo.success();
+    }
+
     /**
      * 刷入表单数据
      *

service-oa/src/main/java/com/java110/oa/dao/IOaWorkflowFormServiceDao.java

@@ -77,4 +77,11 @@ public interface IOaWorkflowFormServiceDao {
      * @return
      */
     int saveOaWorkflowFormDataInfo(Map paramIn);
+
+    /**
+     * 修改表单数据
+     * @param beanCovertMap
+     * @return
+     */
+    int updateOaWorkflowFormData(Map beanCovertMap);
 }

service-oa/src/main/java/com/java110/oa/dao/impl/OaWorkflowFormServiceDaoImpl.java

@@ -145,4 +145,12 @@ public class OaWorkflowFormServiceDaoImpl extends BaseServiceDao implements IOaW
     }
 
 
+    @Override
+    public int updateOaWorkflowFormData(Map paramIn) {
+        logger.debug("保存updateOaWorkflowFormData 入参 info : {}",paramIn);
+
+        int saveFlag = sqlSessionTemplate.insert("oaWorkflowFormServiceDaoImpl.updateOaWorkflowFormData",paramIn);
+        return saveFlag;
+    }
+
 }

service-oa/src/main/java/com/java110/oa/smo/impl/OaWorkflowFormInnerServiceSMOImpl.java

@@ -122,6 +122,11 @@ public class OaWorkflowFormInnerServiceSMOImpl extends BaseServiceSMO implements
         return oaWorkflowFormServiceDaoImpl.saveOaWorkflowFormDataInfo(BeanConvertUtil.beanCovertMap(reqJson));
     }
 
+    @Override
+    public int updateOaWorkflowFormData(@RequestBody JSONObject reqJson) {
+        return oaWorkflowFormServiceDaoImpl.updateOaWorkflowFormData(BeanConvertUtil.beanCovertMap(reqJson));
+    }
+
     public IOaWorkflowFormServiceDao getOaWorkflowFormServiceDaoImpl() {
         return oaWorkflowFormServiceDaoImpl;
     }