fix送检工单详情

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

@@ -22,6 +22,7 @@ import org.jeecg.modules.cmmsSubmission.entity.CmmsSubmission;
 import org.jeecg.modules.cmmsSubmission.service.ICmmsSubmissionService;
 import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionQueryVO;
 import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionXQVO;
+import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionXQZHVO;
 import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
 import org.jeecg.modules.cmmsSubmissionEquipment.service.ICmmsSubmissionEquipmentService;
 import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentXQVO;
@@ -256,8 +257,18 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 	@ApiOperation(value="送检工单表-通过id查询详情", notes="送检工单表-通过id查询详情")
 	@GetMapping(value = "/queryById")
 	public Result<CmmsSubmissionXQVO> queryById(@RequestParam(name="id",required=true) String id) {
-		CmmsSubmission cmmsSubmission = cmmsSubmissionService.getById(id);
-		if(cmmsSubmission==null) {
+		CmmsSubmissionXQZHVO xqzhvo = cmmsSubmissionService.getXqzhvoById(id);
+		/**送检工单状态（0未开始1进行中2已完成）*/
+		if(xqzhvo.getSubmissionGdstatus()!=null && !xqzhvo.getSubmissionGdstatus().equals("")){
+			if(xqzhvo.getSubmissionGdstatus().equals("0"))  xqzhvo.setSubmissionGdstatusText("未开始");
+			else if(xqzhvo.getSubmissionGdstatus().equals("1"))  xqzhvo.setSubmissionGdstatusText("进行中");
+			else if(xqzhvo.getSubmissionGdstatus().equals("2"))  xqzhvo.setSubmissionGdstatusText("已完成");
+		}
+		/**检定方式(0外检)*/
+		if(xqzhvo.getVerificateMethod()!=null && !xqzhvo.getVerificateMethod().equals("")){
+			if(xqzhvo.getVerificateMethod().equals("0"))  xqzhvo.setVerificateMethodText("外检");
+		}
+		if(xqzhvo==null) {
 			return Result.error("未找到对应数据");
 		}
 
@@ -274,7 +285,7 @@ public class CmmsSubmissionController extends JeecgController<CmmsSubmission, IC
 		file.setRelid(id);
 		List<SysUploadFile> uploadFileList = sysUploadFileService.selectFileList(file);
 
-		CmmsSubmissionXQVO xqvo = CmmsSubmissionConvert.INSTANCE.toXQVO(cmmsSubmission, voList, submissionEquipmentList, uploadFileList);
+		CmmsSubmissionXQVO xqvo = CmmsSubmissionConvert.INSTANCE.toXQVO(xqzhvo, voList, submissionEquipmentList, uploadFileList);
 
 		return Result.OK(xqvo);
 	}

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

@@ -6,6 +6,7 @@ import org.jeecg.modules.cmmsSubmission.dto.CmmsSubmissionUpdateDTO;
 import org.jeecg.modules.cmmsSubmission.entity.CmmsSubmission;
 import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionQueryVO;
 import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionXQVO;
+import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionXQZHVO;
 import org.jeecg.modules.cmmsSubmissionEquipment.entity.CmmsSubmissionEquipment;
 import org.jeecg.modules.cmmsSubmissionEquipment.vo.CmmsSubmissionEquipmentXQVO;
 import org.jeecg.modules.sysUploadFile.entity.SysUploadFile;
@@ -29,7 +30,7 @@ public interface CmmsSubmissionConvert {
     CmmsSubmissionQueryVO convertToVO(CmmsSubmission cmmsSubmission, int totalNum, int returnNum, String equipmentids);
 
     /**详情*/
-    CmmsSubmissionXQVO toXQVO(CmmsSubmission cmmsSubmission,
+    CmmsSubmissionXQVO toXQVO(CmmsSubmissionXQZHVO xqzhvo,
                               List<CmmsOrderNodeSubmissionVO> orderNodeSubmissionVOList,
                               List<CmmsSubmissionEquipmentXQVO> submissionEquipmentList,
                               List<SysUploadFile> uploadFileList);

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

@@ -3,8 +3,10 @@ package org.jeecg.modules.cmmsSubmission.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.cmmsSubmission.entity.CmmsSubmission;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionXQZHVO;
 
 /**
  * @Description: 送检工单表
@@ -14,4 +16,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 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, " +
+            "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 " +
+            "where s.id = #{id};")
+    public CmmsSubmissionXQZHVO getXqzhvoById(String id);
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/service/ICmmsSubmissionService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.cmmsSubmission.service;
 
 import org.jeecg.modules.cmmsSubmission.entity.CmmsSubmission;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionXQZHVO;
 
 /**
  * @Description: 送检工单表
@@ -11,4 +12,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICmmsSubmissionService extends IService<CmmsSubmission> {
 
+
+    /**查询详情并转化*/
+    CmmsSubmissionXQZHVO  getXqzhvoById(String id);
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsSubmission/service/impl/CmmsSubmissionServiceImpl.java

@@ -3,6 +3,8 @@ package org.jeecg.modules.cmmsSubmission.service.impl;
 import org.jeecg.modules.cmmsSubmission.entity.CmmsSubmission;
 import org.jeecg.modules.cmmsSubmission.mapper.CmmsSubmissionMapper;
 import org.jeecg.modules.cmmsSubmission.service.ICmmsSubmissionService;
+import org.jeecg.modules.cmmsSubmission.vo.CmmsSubmissionXQZHVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,4 +18,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class CmmsSubmissionServiceImpl extends ServiceImpl<CmmsSubmissionMapper, CmmsSubmission> implements ICmmsSubmissionService {
 
+    @Autowired
+    private CmmsSubmissionMapper cmmsSubmissionMapper;
+
+    /**查询详情并转化*/
+    public CmmsSubmissionXQZHVO getXqzhvoById(String id){
+        return cmmsSubmissionMapper.getXqzhvoById(id);
+    }
+
 }

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

@@ -38,11 +38,13 @@ public class CmmsSubmissionXQVO implements Serializable {
     @Dict(dicCode = "verificate_method")
     @ApiModelProperty(value = "检定方式")
     private java.lang.String verificateMethod;
+    private java.lang.String verificateMethodText;
     /**检定单位id*/
     @Excel(name = "检定单位id", width = 15, dictTable = "base_client", dicText = "client_name", dicCode = "id")
     @Dict(dictTable = "base_client", dicText = "client_name", dicCode = "id")
     @ApiModelProperty(value = "检定单位id")
     private java.lang.String verificateClientId;
+    private java.lang.String verificateClientName;
     /**备注*/
     @Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
@@ -52,6 +54,7 @@ public class CmmsSubmissionXQVO implements Serializable {
     @Dict(dicCode = "submission_gdstatus")
     @ApiModelProperty(value = "送检工单状态（0未开始1进行中1已完成）")
     private java.lang.String submissionGdstatus;
+    private java.lang.String submissionGdstatusText;
     /**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;

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

@@ -0,0 +1,72 @@
+package org.jeecg.modules.cmmsSubmission.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+@Data
+public class CmmsSubmissionXQZHVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+    /**送检工单编号*/
+    @Excel(name = "送检工单编号", width = 15)
+    @ApiModelProperty(value = "送检工单编号")
+    private java.lang.String sjcode;
+    /**送检负责人*/
+    @Excel(name = "送检负责人", width = 15)
+    @ApiModelProperty(value = "送检负责人")
+    @Dict(dictTable = "sys_user", dicText = "username", dicCode = "id")
+    private java.lang.String verificatePerson;
+    /**检定方式(0外检)*/
+    @Excel(name = "检定方式", width = 15, dicCode = "verificate_method")
+    @Dict(dicCode = "verificate_method")
+    @ApiModelProperty(value = "检定方式")
+    private java.lang.String verificateMethod;
+    private java.lang.String verificateMethodText;
+    /**检定单位id*/
+    @Excel(name = "检定单位id", width = 15, dictTable = "base_client", dicText = "client_name", dicCode = "id")
+    @Dict(dictTable = "base_client", dicText = "client_name", dicCode = "id")
+    @ApiModelProperty(value = "检定单位id")
+    private java.lang.String verificateClientId;
+    private java.lang.String verificateClientName;
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+    /**送检工单状态（0未开始1进行中2已完成）*/
+    @Excel(name = "送检工单状态", width = 15, dicCode = "submission_gdstatus")
+    @Dict(dicCode = "submission_gdstatus")
+    @ApiModelProperty(value = "送检工单状态（0未开始1进行中2已完成）")
+    private java.lang.String submissionGdstatus;
+    private java.lang.String submissionGdstatusText;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+}