fix送检工单详情

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/controller/CmmsSubmissionController.java

@@ -229,6 +229,17 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		cmmsSubmissionService.removeById(id);
+
+		/**删除送检工单上传图片*/
+		LambdaQueryWrapper<SysUploadFile> wrapper = new LambdaQueryWrapper<>();
+		wrapper.eq(SysUploadFile::getRelid,id);
+		sysUploadFileService.remove(wrapper);
+
+		/**删除送检工单设备*/
+		LambdaQueryWrapper<CmmsSubmissionEquipment> wrapper1 = new LambdaQueryWrapper<>();
+		wrapper1.eq(CmmsSubmissionEquipment::getCmmsSubmissionId,id);
+		submissionEquipmentService.remove(wrapper1);
+
 		return Result.OK("删除成功!");
 	}
 
@@ -244,6 +255,19 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.cmmsSubmissionService.removeByIds(Arrays.asList(ids.split(",")));
+
+		for (String id : Arrays.asList(ids.split(","))){
+			/**删除送检工单上传图片*/
+			LambdaQueryWrapper<SysUploadFile> wrapper = new LambdaQueryWrapper<>();
+			wrapper.eq(SysUploadFile::getRelid,id);
+			sysUploadFileService.remove(wrapper);
+
+			/**删除送检工单设备*/
+			LambdaQueryWrapper<CmmsSubmissionEquipment> wrapper1 = new LambdaQueryWrapper<>();
+			wrapper1.eq(CmmsSubmissionEquipment::getCmmsSubmissionId,id);
+			submissionEquipmentService.remove(wrapper1);
+		}
+
 		return Result.OK("批量删除成功!");
 	}
 
@@ -272,6 +296,9 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 			return Result.error("未找到对应数据");
 		}
 
+		int totalNum = submissionEquipmentService.totalNum(id);
+		int returnNum = submissionEquipmentService.returnNum(id);
+
 		CmmsOrderNode node = new CmmsOrderNode();
 		node.setRelid(id);
 		List<CmmsOrderNode> list = cmmsOrderNodeService.selectCmmsOrderNodeList(node);
@@ -279,13 +306,26 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 
 		CmmsSubmissionEquipment cmmsSubmissionEquipment = new CmmsSubmissionEquipment();
 		cmmsSubmissionEquipment.setCmmsSubmissionId(id);
-		List<CmmsSubmissionEquipmentXQVO> submissionEquipmentList = submissionEquipmentService.voListByCmmsSubmissionId(cmmsSubmissionEquipment);
+		List<CmmsSubmissionEquipmentXQVO> submissionEquipmentList = submissionEquipmentService.voListByCmmsSubmissionId(cmmsSubmissionEquipment).stream().map(i->{
+			/**检定结果 (0限用、1合格、2禁用)*/
+			if(i.getSubmissionResult()!=null){
+					if(i.getSubmissionResult().equals("0")) i.setSubmissionResultText("限用");
+					else if(i.getSubmissionResult().equals("1")) i.setSubmissionResultText("合格");
+					else if(i.getSubmissionResult().equals("2")) i.setSubmissionResultText("禁用");
+			}
+			/**送检状态 0送检中、1已返回*/
+			if(i.getSubmissionStatus()!=null){
+				if(i.getSubmissionStatus().equals("0")) i.setSubmissionStatusText("送检中");
+				else if(i.getSubmissionStatus().equals("1")) i.setSubmissionStatusText("已返回");
+			}
+			return i;
+		}).collect(Collectors.toList());
 
 		SysUploadFile file = new SysUploadFile();
 		file.setRelid(id);
 		List<SysUploadFile> uploadFileList = sysUploadFileService.selectFileList(file);
 
-		CmmsSubmissionXQVO xqvo = CmmsSubmissionConvert.INSTANCE.toXQVO(xqzhvo, voList, submissionEquipmentList, uploadFileList);
+		CmmsSubmissionXQVO xqvo = CmmsSubmissionConvert.INSTANCE.toXQVO(totalNum, returnNum, xqzhvo, voList, submissionEquipmentList, uploadFileList);
 
 		return Result.OK(xqvo);
 	}

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/convert/CmmsSubmissionConvert.java

@@ -11,6 +11,8 @@ import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
 import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentXQVO;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
 import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Named;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.factory.Mappers;
 import org.springframework.util.CollectionUtils;
@@ -30,7 +32,7 @@ public interface CmmsSubmissionConvert {
     CmmsSubmissionQueryVO convertToVO(CmmsSubmission cmmsSubmission, int totalNum, int returnNum, String equipmentids);
 
     /**详情*/
-    CmmsSubmissionXQVO toXQVO(CmmsSubmissionXQZHVO xqzhvo,
+    CmmsSubmissionXQVO toXQVO(Integer totalNum, Integer returnNum, CmmsSubmissionXQZHVO xqzhvo,
                               List<CmmsOrderNodeSubmissionVO> orderNodeSubmissionVOList,
                               List<CmmsSubmissionEquipmentXQVO> submissionEquipmentList,
                               List<SysUploadFile> uploadFileList);

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/mapper/CmmsSubmissionMapper.java

@@ -18,10 +18,12 @@ public interface CmmsSubmissionMapper extends BaseMapper<CmmsSubmission> {
 
 
     /**查询详情并转化*/
-    @Select("select s.id, s.verificate_person, s.verificate_method, s.verificate_client_id, bc.client_name as verificateClientName, " +
+    @Select("select s.id, s.verificate_person, su.realname, " +
+            "s.verificate_method, s.verificate_client_id, bc.client_name as verificateClientName, " +
             "s.remark, s.create_by, s.create_time, s.update_by, s.update_time, s.sys_org_code, s.submission_gdstatus, s.sjcode " +
             "from cmms_submission s " +
             "left join base_client bc on s.verificate_client_id = bc.id " +
+            "left join sys_user su on s.verificate_person = su.username " +
             "where s.id = #{id};")
     public CmmsSubmissionXQZHVO getXqzhvoById(String id);
 

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/vo/CmmsSubmissionXQVO.java

@@ -20,6 +20,8 @@ import java.util.List;
 public class CmmsSubmissionXQVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
+    private java.lang.Integer totalNum;
+    private java.lang.Integer returnNum;
     /**主键*/
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
@@ -33,6 +35,7 @@ public class CmmsSubmissionXQVO implements Serializable {
     @ApiModelProperty(value = "送检负责人")
     @Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
     private java.lang.String verificatePerson;
+    private java.lang.String realname;
     /**检定方式*/
     @Excel(name = "检定方式", width = 15, dicCode = "verificate_method")
     @Dict(dicCode = "verificate_method")

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/vo/CmmsSubmissionXQZHVO.java

@@ -28,6 +28,7 @@ public class CmmsSubmissionXQZHVO implements Serializable {
     @ApiModelProperty(value = "送检负责人")
     @Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
     private java.lang.String verificatePerson;
+    private java.lang.String realname;
     /**检定方式(0外检)*/
     @Excel(name = "检定方式", width = 15, dicCode = "verificate_method")
     @Dict(dicCode = "verificate_method")

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmissionEquipment/vo/CmmsSubmissionEquipmentXQVO.java

@@ -39,6 +39,7 @@ public class CmmsSubmissionEquipmentXQVO implements Serializable {
     @Dict(dicCode = "device_verification_result")
     @ApiModelProperty(value = "检定结果")
     private java.lang.String submissionResult;
+    private java.lang.String submissionResultText;
     /**有效日期*/
     @Excel(name = "有效日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@@ -58,6 +59,7 @@ public class CmmsSubmissionEquipmentXQVO implements Serializable {
     @Dict(dicCode = "submission_status")
     @ApiModelProperty(value = "送检状态")
     private java.lang.String submissionStatus;
+    private java.lang.String submissionStatusText;
     /**送回日期*/
     @Excel(name = "送回日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")