fix(jg):设备履历字段添加

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgResumeInfoController.java

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.yeejoin.amos.boot.module.jg.api.dto.JgResumeInfoDto;
+import com.yeejoin.amos.boot.module.jg.api.entity.JgResumeInfo;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -105,12 +106,13 @@ public class JgResumeInfoController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询", notes = "分页查询")
-	public ResponseModel<Page<JgResumeInfoDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<JgResumeInfoDto> page = new Page<JgResumeInfoDto>();
+	public ResponseModel<Page<JgResumeInfoDto>> queryForPage(@RequestParam(value = "current") int current,
+															 @RequestParam(value = "size") int size,
+															 @RequestParam(value = "record") String record) {
+	    Page<JgResumeInfoDto> page = new Page<>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(jgResumeInfoServiceImpl.queryForJgResumeInfoPage(page));
+	    return ResponseHelper.buildResponse(jgResumeInfoServiceImpl.queryForJgResumeInfoPage(page, record));
 	}
 
 	/**
@@ -124,4 +126,17 @@ public class JgResumeInfoController extends BaseController {
 	public ResponseModel<List<JgResumeInfoDto>> selectForList() {
 	    return ResponseHelper.buildResponse(jgResumeInfoServiceImpl.queryForJgResumeInfoList());
 	}
+
+	/**
+	 * 根据changeLogId查询详情
+	 *
+	 * @param changeLogId 主键
+	 * @return ResponseModel
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/details")
+	@ApiOperation(httpMethod = "GET", value = "根据changeLogId查询设备编辑详情", notes = "根据changeLogId查询设备编辑详情")
+	public ResponseModel<JgResumeInfo> getDetails(@RequestParam("changeLogId") String changeLogId) {
+		return ResponseHelper.buildResponse(jgResumeInfoServiceImpl.getDetails(changeLogId));
+	}
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/event/listener/ChangeLogInsertListener.java

@@ -129,13 +129,13 @@ public class ChangeLogInsertListener {
         bizChangeLogService.getBaseMapper().insert(changeLog);
         String equId = event.getBizRelationData().getRecords().stream().findFirst().orElse(null);
         jgResumeInfoService.createWithModel(JgResumeInfoDto.builder()
-                .applyNo(event.getBizRelationData().getUnitCode())
+                .applyNo(event.getBizRelationData().getBizId())
                 .businessType(BusinessTypeEnum.findNameByEnumName(bizTypeTableMap.get(changeLog.getBizType())).orElse("未知类型"))
                 .businessId(event.getBizRelationData().getBizId())
                 .equId(equId)
                 .resumeType("1")
                 .changeLogId(String.valueOf(changeLog.getSequenceNbr()))
-                .approvalUnit(event.getBizRelationData().getUnitCode())
+                .approvalUnit(event.getBizRelationData().getUnitName())
                 .approvalUnitCode(event.getBizRelationData().getUnitCode())
                 .createUserName(event.getBizRelationData().getCreateUserName())
                 .status("正常")

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgResumeInfoServiceImpl.java

@@ -9,7 +9,6 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgResumeInfoService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -26,8 +25,8 @@ public class JgResumeInfoServiceImpl extends BaseService<JgResumeInfoDto, JgResu
     /**
      * 分页查询
      */
-    public Page<JgResumeInfoDto> queryForJgResumeInfoPage(Page<JgResumeInfoDto> page) {
-        return this.queryForPage(page, null, false);
+    public Page<JgResumeInfoDto> queryForJgResumeInfoPage(Page<JgResumeInfoDto> page, String equId) {
+        return this.queryForPage(page, null, false, equId);
     }
 
     /**
@@ -63,4 +62,9 @@ public class JgResumeInfoServiceImpl extends BaseService<JgResumeInfoDto, JgResu
     public void deleteBatchByBusinessId(Set<String> idList) {
         this.baseMapper.deleteBatchByBusinessId(idList);
     }
+
+    public JgResumeInfo getDetails(String changeLogId) {
+        return this.baseMapper.selectOne(new LambdaQueryWrapper<JgResumeInfo>()
+                .eq(JgResumeInfo::getChangeLogId, changeLogId));
+    }
 }
\ No newline at end of file