[清退] 代码提交

dev-library/src/main/java/com/tykj/dev/device/library/subject/domin/DeviceLibrary.java

@@ -209,4 +209,11 @@ public class DeviceLibrary {
         childs.add(deviceLibraryEntity);
     }
 
+    public DeviceLibrary toVo(){
+        if (!this.locationUnit.equals(this.ownUnit)){
+            this.manageStatus=0;
+        }
+        return this;
+    }
+
 }

dev-misc/src/main/java/com/tykj/dev/misc/base/StatusEnum.java

@@ -54,12 +54,15 @@ public enum StatusEnum {
      * 清退任务
      */
     //以下为stat状态
-    SEND_BACK_1200(1200, "省清退查看"),
+    SEND_BACK_1200(1200, "省市清退查看"),
     SEND_BACK_1201(1201, "统计数据等待办结"),
-    SEND_BACK_1202(1202, "待审核"),
+    SEND_BACK_1202(1202, "出库待审核"),
     SEND_BACK_1203(1203, "出库待校验"),
     SEND_BACK_1204(1204, "入库待审核"),
-    SEND_BACK_1205(1205, "装备入库发起成功等待审核"),
+    SEND_BACK_1205(1205, "异常装备待描述"),
+    SEND_BACK_1206(1206, "入库待校验"),
+    SEND_BACK_1207(1207, "异常装备确认"),
+
 
 //    SEND_BACK_1204(1204, "入库待审核"),
 

dev-sendback/src/main/java/com/tykj/dev/device/sendback/controller/SendBackController.java

@@ -71,7 +71,7 @@ public class SendBackController {
 
 
     @ApiOperation(value = "清退装备校对发起——专管员A",notes = "清退装备校对发起——专管员A")
-    @PostMapping("/sendBackOutCheck/{userId}/{taskId}")
+    @GetMapping("/sendBackOutCheck/{userId}/{taskId}")
     ResponseEntity sendBackOutCheck(@PathVariable("taskId") Integer taskId,@PathVariable("userId") Integer userId){
         return sendBackService.sendBackOutCheck(taskId,userId);
     }
@@ -79,7 +79,7 @@ public class SendBackController {
 
 
     @ApiOperation(value = "装备出库发起——专管员A",notes = "装备出库发起——专管员A")
-    @PostMapping("/sendBackOut/{taskId}/{userId}")
+    @PostMapping("/sendBackOut/{userId}/{taskId}")
     ResponseEntity sendBackOut(@PathVariable("taskId") Integer taskId, @RequestBody SendBackOutVo sendBackOut, @PathVariable("userId") Integer userId){
         return sendBackService.sendBackOut(taskId,sendBackOut,userId);
 

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/domain/SendBackBill.java

@@ -98,4 +98,6 @@ public class SendBackBill {
 	@ApiModelProperty(value = "清退单id")
 	private Integer formId;
 
+	@ApiModelProperty(value = "是否完成")
+    private Integer isComplete;
 }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/SendBackOutVo.java

@@ -52,6 +52,18 @@ public class SendBackOutVo {
 
     @ApiModelProperty(value = "出库装备清单")
     private List<DeviceLibrary> deviceLibraryEntities;
+
+    /**
+     * 接收方入库检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如x10x21x32x,意为主键id为1的装备缺失,为2的无误,为3的不匹配
+     */
+    @ApiModelProperty(value = "接收方入库检查详情(装备主键id+核对结果(0缺失1无误3不匹配,字符x作为分隔符)),例如x10x21x32x,意为主键id为1的装备缺失,为2的无误,为3的不匹配")
+    private String receiveCheckDetail;
+    /**
+     * 接收方检查结果(缺失数量x新增数量),例如1x1,意为缺失1台,新增一条
+     */
+    @ApiModelProperty(value = "接收方检查结果(缺失数量x新增数量),例如1x1,意为缺失1台,新增一条")
+    private String receiveCheckResult;
+
 //
 //    @ApiModelProperty(value = "非在库装备")
 //    private List<DeviceLibraryEntity> unDeviceLibraryEntities;

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/SendBackRequst.java

@@ -24,7 +24,7 @@ public class SendBackRequst {
     @ApiModelProperty(value = "父task的Id")
     private Integer parentTaskId;
 
-    @ApiModelProperty(value = "为在库装备备注")
+    @ApiModelProperty(value = "未在库装备备注")
     private HashMap<Integer,UnDeviceDesVo> unDeviceDes;
 
     @ApiModelProperty(value = "查询类型，0：省级 1：市级 2：区县级")

dev-sendback/src/main/java/com/tykj/dev/device/sendback/entity/vo/SendBackVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -38,12 +39,6 @@ public class SendBackVo {
     @ApiModelProperty(value = "所有清退装备的id")
     private List<Integer> deviceIdList;
     
-//    @ApiModelProperty(value = "用于前端取值")
-//    private List<SendBackStatisticalVo> sendBackStatisticalVo;
-//
-//    @ApiModelProperty(value = "将清退装备的id根据市或县分类，key为市名或县名,value该市或该县的idStrong")
-//    private HashMap<String,StringBuffer> cityClassify;
-//
     @ApiModelProperty(value = "异常装备")
     private List<DeviceLibrary> unDevice;
 

dev-sendback/src/main/java/com/tykj/dev/device/sendback/repository/SendBackBillDetailDao.java

@@ -13,6 +13,6 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  */
 public interface SendBackBillDetailDao extends JpaRepository<SendBackBillDetail,Integer>, JpaSpecificationExecutor<SendBackBillDetail> {
 
-    SendBackBillDetail findSendBackBillDetailEntityById(Integer id);
+    SendBackBillDetail findSendBackBillDetailById(Integer id);
 
 }

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/SendBackService.java

@@ -75,6 +75,8 @@ public interface SendBackService {
      */
     ResponseEntity sendBackOutExamine(Integer taskId, Integer startUserId, Integer type);
 
+
+
     /**
      * 入库-专管员B
      * 1、通过，完结task
@@ -107,6 +109,7 @@ public interface SendBackService {
 
     ResponseEntity saveSendBackBillDetailEntity(SendBackBillDetail sendBackBillDetailEntity);
 
+
     ResponseEntity sendBackInCheck(Integer taskId, SendBackOutVo sendBackOut, Integer userId);
 
     /**

dev-task/src/main/java/com/tykj/dev/device/task/repository/TaskDao.java

@@ -51,4 +51,5 @@ public interface TaskDao extends JpaRepository<Task, Integer>, JpaSpecificationE
 
     List<Task> findTaskEntitiesByParentTaskId(Integer parentTaskId);
 
+    Task findByBusinessTypeAndOwnUnitAndBillStatus(Integer type,Integer ownUnit,Integer billStatus);
 }

dev-task/src/main/java/com/tykj/dev/device/task/service/impl/TaskServiceImpl.java

@@ -631,6 +631,9 @@ public class TaskServiceImpl implements TaskService {
         if (list.size() > 0) {
             //筛选出当前用户操作该业务的所有日志，根据业务日志的创建时间降序排列，得到最新的上一次操作时间
             List<TaskLog> taskLogs = taskUtils.orderByCreateTimeDesc(list.stream().filter(taskLog -> taskLog.getCreateUserId().equals(userUtils.getCurrentUserId())).collect(Collectors.toList()));
+            if (taskLogs.size()==0){
+                return null;
+            }
             return taskLogs.get(0).getCreateTime();
         } else {
             return null;

dev-train/src/main/java/com/tykj/dev/device/train/controller/HandoverController.java

@@ -26,7 +26,7 @@ import springfox.documentation.annotations.ApiIgnore;
  * @createTime 2020年08月19日 09:36:00
  */
 @RestController
-@RequestMapping(value = "/user/handover/")
+@RequestMapping(value = "/user/handover")
 @AutoDocument
 @Api(tags = "工作交接",description = "工作交接")
 public class HandoverController {
@@ -58,7 +58,7 @@ public class HandoverController {
     }
 
     @GetMapping(value = "/query/{workId}")
-    @ApiOperation(value = "完结工作交接")
+    @ApiOperation(value = "查询")
     public ResponseEntity getHandoverUser( @PathVariable Integer workId) {
 
         return ResponseEntity.ok(workHandoverService.findById(workId));

dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java

@@ -169,9 +169,8 @@ public class TrainJobController {
 //            jobService.update(jobEntity);
             TaskLogBto taskLogBto = new TaskLogBto(taskBto.getId(),"不报名",null);
             taskLogService.addLog(taskLogBto);
-            taskBto=taskService.moveToEnd(taskBto);
+           taskService.moveToEnd(taskBto);
        }
-        taskService.update(taskBto);
         myWebSocket.sendMessage1();
         return ResponseEntity.ok(trainThemeService.save(trainTheme));
     }
@@ -187,10 +186,10 @@ public class TrainJobController {
         TrainTheme trainTheme = trainThemeService.findById(trainId);
         //查询所有必须报名而没有报名的task 状态直接转为待培训
         trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN.id, StatusEnum.TRAIN1001.id).forEach(
-                taskBto -> taskService.update(taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1003, -1))
+                taskBto -> taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1003, -1)
         );
         trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN.id, StatusEnum.TRAIN1002.id).forEach(
-                taskBto -> taskService.update(taskService.moveToEnd(taskBto))
+                taskBto -> taskService.moveToEnd(taskBto)
         );
 
         //未报名统一处理为为报名
@@ -202,7 +201,7 @@ public class TrainJobController {
 //                }
 //        );
         trainTaskService.selectBillidAndBillType(trainId,BusinessEnum.TRAIN.id,StatusEnum.TRAIN1000.id).forEach(
-                taskBto ->taskService.update( taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1010))
+                taskBto ->taskService.moveToSpecial(taskBto,StatusEnum.TRAIN1010)
         );
 //        TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
 //        taskEntity.setBillStatus(7);
@@ -228,7 +227,7 @@ public class TrainJobController {
     public ResponseEntity inTraining(@PathVariable Integer trainId) {
         TrainTheme trainTheme = trainThemeService.findById(trainId);
         trainTaskService.selectBillidAndBillType(trainId, BusinessEnum.TRAIN.id, StatusEnum.TRAIN1010.id).forEach(
-                taskBto -> taskService.update(taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1004, taskBto.getInvolveUserIdList().get(0)))
+                taskBto -> taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1004, taskBto.getInvolveUserIdList().get(0))
         );
 //        TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
 //        taskEntity.setBillStatus(8);
@@ -279,7 +278,7 @@ public class TrainJobController {
 //        TaskEntity taskEntity= taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(),trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
         TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
         taskBto.setOwnUnit(1);
-        taskService.update(taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1005));
+        taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1005);
 //        taskEntity.setBillStatus(32);
 //        taskEntity.setOwnUnit(1);
 //        taskService.update(taskEntity);
@@ -443,7 +442,7 @@ public class TrainJobController {
         TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
         TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
         taskBto = taskService.addInvolveUser(taskBto, securityUser.getCurrentUserInfo().getUserId());
-        taskService.update(taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1006, gradeEntryVo.getAuditId()));
+        taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1006, gradeEntryVo.getAuditId());
 
 
 //        TaskEntity taskEntity= taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
@@ -482,7 +481,7 @@ public class TrainJobController {
     public ResponseEntity audit(@ApiIgnore @AuthenticationPrincipal SecurityUser securityUser, @RequestBody GradeEntryVo gradeEntryVo) {
         TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
         TaskBto taskBto = trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(), BusinessEnum.TRAIN.id);
-        taskService.update(taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1007, gradeEntryVo.getAuditId()));
+        taskService.moveToSpecial(taskBto, StatusEnum.TRAIN1007, gradeEntryVo.getAuditId());
 
 //
 //        TaskEntity taskEntity= taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
@@ -528,7 +527,7 @@ public class TrainJobController {
         TrainTheme trainTheme = trainThemeService.findById(gradeEntryVo.getTrainThemeId());
         //给培训报名的人员都发起一个通知，查看自己都证书
         TaskBto taskBto=trainTaskService.selectFatherIsNullAndBillidAndBillType(trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
-        taskService.update(taskService.moveToEnd(taskBto));
+        taskService.moveToEnd(taskBto);
 //        TaskEntity taskEntity=taskService.findByParentAndBillIdAndBussType(0,trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
 //        //8 培训完成
 //        taskEntity.setBillStatus(15);
@@ -692,7 +691,7 @@ public class TrainJobController {
         //给培训报名的人员都发起一个通知，查看自己都证书
 //        TaskEntity taskEntity=taskService.findByStartUserIdAndBillIdAndBussType(securityUser.getCurrentUserInfo().getUserId(),trainTheme.getTrainId(),BusinessEnum.TRAIN.id);
         TaskBto taskBto = taskService.get(signUpReturn.getTaskId());
-        taskService.update(taskService.moveToEnd(taskBto));
+        taskService.moveToEnd(taskBto);
 //        taskEntity.setBillStatus(BusinessEnum.TRAIN.id);
 //        taskService.update(taskEntity);
 //        JobEntity jobEntity= taskUtils.getCurrentJob(taskEntity.getId());

dev-train/src/main/java/com/tykj/dev/device/train/entity/TrainTheme.java

@@ -148,21 +148,33 @@ public class TrainTheme {
     /**
      * 发证状态
      */
-    @ApiModelProperty(value = "发证状态")
+    @ApiModelProperty(value = "发证状态",name = "isCertificate")
     private Integer isCertificate;
 
     /**
      * 及格
      */
-    @ApiModelProperty(value = "发证状态")
+    @ApiModelProperty(value = "及格",name = "pass")
     private Integer pass;
 
     /**
      * 优秀
      */
-    @ApiModelProperty(value = "发证状态")
+    @ApiModelProperty(value = "优秀",name = "good")
     private Integer good;
 
+    /**
+     * 培训试卷url
+     */
+    @ApiModelProperty(value = "培训试卷url",name = "trainPapersUrl")
+    private String trainPapersUrl;
+
+    /**
+     * 培训试卷名称
+     */
+    @ApiModelProperty(value = "培训试卷名称",name = "trainPapersName")
+    private String trainPapersName;
+
 
 
     public ByTrainingPeople toByTrainingPeople(){

dev-union/src/main/resources/application-dev.properties

-spring.datasource.url=jdbc:mysql://192.168.100.249:3306/device?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+spring.datasource.url=jdbc:mysql://localhost:3306/device?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=root
 spring.datasource.password=root

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/RolePermissionsServiceImpl.java

@@ -6,6 +6,7 @@ import com.tykj.dev.device.user.subject.service.RolePermissionsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 /**
@@ -35,6 +36,7 @@ public class RolePermissionsServiceImpl implements RolePermissionsService {
     }
 
     @Override
+    @Transactional
     public void deleteFindRoleId(Integer roleId) {
         rolePermissionsDao.deleteAllByRoleId(roleId);
     }

dev-user/src/main/java/com/tykj/dev/device/user/subject/service/impl/UnitsServiceImpl.java

@@ -105,7 +105,7 @@ public class UnitsServiceImpl implements UnitsService {
     @Override
     public Units findByAreaId(Integer unitsId) {
 
-        return  unitsDao.findAllByAreaId(areaDao.findById(findById(unitsId).getAreaId()).get().getFatherId() ).get(0);
+        return  unitsDao.findAllByAreaId(areaDao.findById(findById(unitsId).getAreaId()).get().getFatherId()).get(0);
 
     }