提交儿童睡袋 t

src/main/java/com/lz/modules/app/controller/ResultRecordController.java

@@ -652,6 +652,7 @@ public class ResultRecordController extends AbstractController {
      */
     @RequestMapping("/new/approval")
     public R approval(ApprovalDto approvalDto) {
+        approvalDto.setLoginUserId(approvalDto.getLoginUserId());
         return resultRecordService.newApproval(approvalDto);
 
     }
@@ -660,9 +661,4 @@ public class ResultRecordController extends AbstractController {
 
 
 
-
-
-
-
-
 }

src/main/java/com/lz/modules/app/controller/TestController.java

@@ -6,6 +6,7 @@ import com.dingtalk.api.response.OapiCrmAuthGroupMemberListResponse;
 import com.lz.common.utils.R;
 import com.lz.common.utils.StringUtil;
 import com.lz.modules.app.dao.DepartmentsDao;
+import com.lz.modules.app.dto.ApprovalDto;
 import com.lz.modules.app.entity.DepartmentsEntity;
 import com.lz.modules.app.entity.DepartmentsStaffRelateEntity;
 import com.lz.modules.app.entity.StaffEntity;
@@ -261,8 +262,21 @@ public class TestController {
     @RequestMapping("/test/resultrecord")
     public void resultRecorcd(Long resultRecordId) throws Exception{
         R r = resultRecordService.initFlowRecord(resultRecordId);
+    }
 
 
+
+    /**
+     * 删除
+     */
+    // http://localhost:8080/lz_management/user/lzresultrecord/new/approval?resultRecordId=215&status=1
+    @RequestMapping("/new/approval")
+    public R approval(Long resultRecordId,Integer status ) {
+        ApprovalDto approvalDto = new ApprovalDto();
+        approvalDto.setResultRecordId(resultRecordId);
+        approvalDto.setStatus(status);
+        return resultRecordService.newApproval(approvalDto);
+
     }
 
 

src/main/java/com/lz/modules/app/dto/ApprovalDto.java

@@ -7,4 +7,5 @@ public class ApprovalDto {
     private Long resultRecordId;
     private Integer status; //1 提交审批,审批通过,2 撤回,3 催办,5 驳回，6 申述，7 流程终止
     private Long loginUserId;
+    private String menuName;    //按钮名称
 }

src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java

@@ -62,4 +62,6 @@ public interface FlowRecordMapper extends BaseMapper<FlowRecord> {
 
 
 	List<FlowRecord> selectFlowRecordByRecordIdStatus(@Param("resultRecordId") Long resultRecordId, @Param("status") Integer status);
+
+	FlowRecord selectFlowRecordByRecordIdAndFlowId(@Param("resultRecordId") Long resultRecordId, @Param("flowId") Long flowId);
 }

src/main/java/com/lz/modules/flow/service/FlowRecordService.java

@@ -61,4 +61,6 @@ public interface FlowRecordService extends IService<FlowRecord> {
     void insertFlowRecords(List<FlowRecord> flowRecords);
 
 	List<FlowRecord> selectFlowRecordByRecordIdStatus(Long resultRecordId,Integer status);
+
+	FlowRecord selectFlowRecordByRecordIdAndFlowId(Long resultRecordId, Long id);
 }

src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java

@@ -168,4 +168,9 @@ public class FlowRecordServiceImpl extends ServiceImpl<FlowRecordMapper, FlowRec
 	public List<FlowRecord> selectFlowRecordByRecordIdStatus(Long resultRecordId,Integer status) {
 		return flowRecordMapper.selectFlowRecordByRecordIdStatus(resultRecordId,status);
 	}
+
+	@Override
+	public FlowRecord selectFlowRecordByRecordIdAndFlowId(Long resultRecordId, Long flowId) {
+		return flowRecordMapper.selectFlowRecordByRecordIdAndFlowId(resultRecordId,flowId);
+	}
 }

src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java

@@ -818,21 +818,27 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             case 1: //1 提交审批,审批通过
                 return newSubmit(approvalDto);
             case 2:     //2 撤回
-                return newReject(approvalDto);
+                return reSubmit(approvalDto);
             case 3:     //3 催办
                 return urge(approvalDto);
             case 5:     //4 驳回
                 return newReject(approvalDto);
             case 6:     //6 申述
                 return explain(approvalDto);
-            case 7:     //7 终止流程
-                return stop(approvalDto);
             default:
                 break;
         }
         return null;
     }
 
+    private R reSubmit(ApprovalDto approvalDto) {
+        List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(approvalDto.getResultRecordId(), 1);
+        if(flowRecords!=null && flowRecords.size()>0){
+            return R.error("领导己经审批，不能撤回");
+        }
+        return newReject(approvalDto);
+    }
+
     private R newSubmit(ApprovalDto approvalDto) {
         List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordId(approvalDto.getResultRecordId());
         ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(approvalDto.getResultRecordId());
@@ -869,12 +875,16 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
                 flowRecord.setStatus(0);
                 flowRecordService.updateFlowRecordById(flowRecord);
             }
-            ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(approvalDto.getResultRecordId());
-            resultRecord.setCurrentApprovalStaffId(currentFlowRecord.getApprovalStaffId());
-            resultRecord.setCurrentApprovalStaffName(currentFlowRecord.getApprovalStaffName());
-            resultRecord.setFlowStaffIdRole(currentFlowRecord.getFlowStaffIdRole());
 
-            FlowChart flowChart = flowService.selectFlowChartByChartId(currentFlowRecord.getFlowId());
+            FlowRecord lastFlowRecord = flowRecordService.selectFlowRecordByRecordIdAndFlowId(approvalDto.getResultRecordId(),currentFlowRecord.getId());
+            lastFlowRecord.setStatus(2);
+            flowRecordService.updateFlowRecordById(lastFlowRecord);
+
+            ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(approvalDto.getResultRecordId());
+            resultRecord.setCurrentApprovalStaffId(lastFlowRecord.getApprovalStaffId());
+            resultRecord.setCurrentApprovalStaffName(lastFlowRecord.getApprovalStaffName());
+            resultRecord.setFlowStaffIdRole(lastFlowRecord.getFlowStaffIdRole());
+            FlowChart flowChart = flowService.selectFlowChartByChartId(lastFlowRecord.getFlowId());
             resultRecord.setFlowProcess(flowChart.getFlowProcess());
             resultRecordService.updateResultRecordById(resultRecord);
         }
@@ -882,20 +892,18 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
     }
 
 
-
     private R urge(ApprovalDto approvalDto) {
         ResultRecord resultRecord = resultRecordMapper.selectResultRecordById(approvalDto.getResultRecordId());
         if(!resultRecord.getCurrentApprovalStaffId().equals(approvalDto.getLoginUserId())){
             log.info("催办" +  resultRecord.getCurrentApprovalStaffId());
+            StaffEntity mySelf = staffService.selectStaffById(resultRecord.getStaffId());
+            StaffEntity toSelf = staffService.selectStaffById(resultRecord.getCurrentApprovalStaffId());
+            resultRecordService.sendWorkMSG(mySelf, toSelf, WorkMsgTypeEnum.URGING, 0L, 2);
         }
         return R.ok();
     }
 
 
-    private R stop(ApprovalDto approvalDto) {
-
-        return R.ok();
-    }
 
     private R explain(ApprovalDto approvalDto) {
 

src/main/resources/mapper/flow/FlowRecordMapper.xml

@@ -266,7 +266,9 @@
     <select id="selectFlowRecordByRecordIdStatus" resultType="com.lz.modules.flow.entity.FlowRecord">
         select * from lz_flow_record  where  is_delete = 0 and record_id = #{resultRecordId} and status = #{status}
     </select>
-
+    <select id="selectFlowRecordByRecordIdAndFlowId" resultType="com.lz.modules.flow.entity.FlowRecord">
+         select * from lz_flow_record  where  is_delete = 0 and record_id = #{resultRecordId} and  #{flowId} > id order by id desc limit 1
+    </select>
 
 
 </mapper>