巡查人员完成任务接口字段添加

guoshilong

2023-04-28 671e04db32af296f461b3b3dc71fbcbe03d2a357

巡查人员完成任务接口字段添加

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java

@@ -188,8 +188,8 @@
     */
    @PostMapping("patrol-complete-task")
    @ApiOperation(value = "完成任务", notes = "传入流程信息")
    public R completeTask(PatrolTask patrolTask, String currentUserId) {
        return R.status(patrolTaskService.patrolCompleteTask(patrolTask,currentUserId));
    public R completeTask(PatrolTask patrolTask, String currentUserId,String taskUser) {
        return R.status(patrolTaskService.patrolCompleteTask(patrolTask,currentUserId,taskUser));
    }

    /**

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml

@@ -128,7 +128,7 @@
        where spt.id = #{id}
    </select>
    <select id="customizeGetById" resultType="cn.gistack.sm.patrol.entity.PatrolTask">
        SELECT T.ID,T.TITLE,T.TO_USER_ID,A.PROBLEM_COUNT,T.PROJECT_ID,T.CONTENT FROM SM_PATROL_TASK T
        SELECT T.ID,T.TITLE,T.TO_USER_ID,A.PROBLEM_COUNT,T.PROJECT_ID,T.CONTENT,T.STATE FROM SM_PATROL_TASK T
        LEFT JOIN (
            SELECT COUNT(*) PROBLEM_COUNT,R.TASK_ID FROM SM_PATROL_REPORT R WHERE R.TASK_ID = #{id} AND R.STATUS = 2 GROUP BY R.TASK_ID
        )A ON A.TASK_ID = T.ID

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java

@@ -57,7 +57,7 @@
     */
    boolean startProcess(PatrolTask patrolTask);

    boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId);
    boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId,String taskUser);

    boolean chargeCompletePerson(BladeFlowTask bladeFlowTask);


 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java

@@ -138,7 +138,7 @@

    @Override
    @Transactional
    public boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId) {
    public boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId,String taskUser) {
        R<BladeFlow> res = flowClient.getBladeFlow(patrolTask.getId().toString(),currentUserId);
        if (res.isSuccess()){
            BladeFlow flow = res.getData();
@@ -152,7 +152,7 @@
                variables = Kv.create();
            }
            variables.put(ProcessConstant.REPORT_KEY,patrolTask.getReport());
            variables.put("taskUser",StringUtil.format("{}{}", TASK_USR_PREFIX, "1650048152667467777"));
            variables.put("taskUser",StringUtil.format("{}{}", TASK_USR_PREFIX, taskUser));
            // 完成任务
            flowClient.completeTask(taskId,processInstanceId,comment,variables);
            saveReport(patrolTask);