优化

platform-dao/src/main/java/com/platform/dao/dto/sbUnuseddetail/SbUnusedDetailDTO.java

@@ -21,6 +21,20 @@ import java.time.LocalDate;
 @EqualsAndHashCode(callSuper = true)
 public class SbUnusedDetailDTO extends BaseDTO implements Serializable {
 
+    private String applyReason;//申请原因
+
+    private String oldPositionId;//原设备位置 (老设备位置选择设备后自动带出了，新设备位置，让用户自己选择）
+
+    private String newPositionId;//新设备位置
+
+    private String newPositionNo;//新位号（手动填写）
+
+
+
+    private Integer clean;//是否清洗0：否，1：是(下来选择）
+
+    private String sbIntact;//设备完好性（铭牌&零部件&外观）（手动填写）
+
       /**
      *
      */

platform-dao/src/main/java/com/platform/dao/entity/sbUnused/SbUnused.java

@@ -21,6 +21,8 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_sb_unused")
 public class SbUnused implements Serializable{
+
+
     private LocalDateTime updateTime;
     private String advice;//意见
     private String no;

platform-dao/src/main/java/com/platform/dao/entity/sbUnuseddetail/SbUnusedDetail.java

@@ -21,6 +21,19 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_sb_unused_detail")
 public class SbUnusedDetail implements Serializable{
+    private String applyReason;//申请原因
+
+    private String oldPositionId;//原设备位置 (老设备位置选择设备后自动带出了，新设备位置，让用户自己选择）
+
+    private String newPositionId;//新设备位置
+
+    private String newPositionNo;//新位号（手动填写）
+
+
+
+    private Integer clean;//是否清洗0：否，1：是(下来选择）
+
+    private String sbIntact;//设备完好性（铭牌&零部件&外观）（手动填写）
 
 
     /**

platform-dao/src/main/java/com/platform/dao/mapper/sb/SbInfoMapper.java

@@ -22,6 +22,8 @@ import java.util.Map;
  */
 @Component
 public interface SbInfoMapper extends MyMapper<SbInfo> {
+    void updateUnusedBatch(List<SbInfoDTO> list);
+
     List<String> selectList2(SbInfoDTO dto);
 
 

platform-dao/src/main/java/com/platform/dao/vo/query/sbUnuseddetail/SbUnusedDetailVO.java

@@ -23,6 +23,24 @@ import java.util.List;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbUnusedDetailVO extends BaseVO implements Serializable{
+    private String applyReason;//申请原因
+
+    private String oldPositionId;//原设备位置 (老设备位置选择设备后自动带出了，新设备位置，让用户自己选择）
+
+    private String newPositionId;//新设备位置
+
+    private String oldPositionName;//原设备位置 (老设备位置选择设备后自动带出了，新设备位置，让用户自己选择）
+
+    private String newPositionName;//新设备位置
+
+    private String newPositionNo;//新位号（手动填写）
+
+
+
+    private Integer clean;//是否清洗0：否，1：是(下来选择）
+
+    private String sbIntact;//设备完好性（铭牌&零部件&外观）（手动填写）
+
     private List<SysFile> usedFileList;
 
     private String positionName;

platform-dao/src/main/resources/mapper/sb/SbInfoMapper.xml

@@ -700,6 +700,16 @@ sb.check_type
             where id = #{item.id}
         </foreach>
     </update>
+    <update id="updateUnusedBatch" parameterType="java.util.List">
+        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
+            update t_sb_info
+            <set>
+                position_id=#{item.positionId},
+                position_no=#{item.positionNo}
+            </set>
+            where id = #{item.id}
+        </foreach>
+    </update>
 
     <update id="updateBatchChild" parameterType="java.util.List">
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">

platform-dao/src/main/resources/mapper/sbUnuseddetail/SbUnusedDetailMapper.xml

@@ -53,10 +53,11 @@
         </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.sbUnuseddetail.SbUnusedDetailDTO" resultType="com.platform.dao.vo.query.sbUnuseddetail.SbUnusedDetailVO">
-        select unusedDetails.*,sbInfo.name as sbName,sbInfo.position_no as positionNo,sbinfo.no as sbNo,position.name as positionName
+        select unusedDetails.*,sbInfo.name as sbName,sbinfo.no as sbNo,position1.name as oldPositionName,position2.name as newPositionName
         from t_sb_unused_detail as unusedDetails left join t_sb_info sbInfo
         on sbInfo.id = unusedDetails.sb_id
-        left join t_sb_position position on position.id=sbInfo.position_id
+        left join t_sb_position position1 on position1.id=unusedDetails.old_position_id
+        left join t_sb_position position2 on position2.id=unusedDetails.new_position_id
         left join t_sys_file file on file.target_id = unusedDetails.id
         <where>
             <include refid="List_Condition" />

platform-service/src/main/java/com/platform/service/sbUnused/impl/SbUnusedServiceImpl.java

@@ -13,11 +13,13 @@ import com.platform.dao.dto.sb.SbInfoDTO;
 import com.platform.dao.dto.sbUnusedVerifyRecord.SbUnusedVerifyRecordDTO;
 import com.platform.dao.dto.sbUnuseddetail.SbUnusedDetailDTO;
 import com.platform.dao.dto.upms.SysFileDTO;
+import com.platform.dao.entity.sb.SbInfo;
 import com.platform.dao.entity.sbUnusedVerifyRecord.SbUnusedVerifyRecord;
 import com.platform.dao.entity.sbUnuseddetail.SbUnusedDetail;
 import com.platform.dao.entity.upms.SysFile;
 import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.enums.*;
+import com.platform.dao.mapper.sb.SbInfoMapper;
 import com.platform.dao.mapper.sbUnusedVerifyRecord.SbUnusedVerifyRecordMapper;
 import com.platform.dao.mapper.sbUnuseddetail.SbUnusedDetailMapper;
 import com.platform.dao.mapper.upms.SysFileMapper;
@@ -62,6 +64,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
     private SysUserMapper sysUserMapper;
     private final SysFileService sysFileService;
     private SysFileMapper sysFileMapper;
+    private SbInfoMapper sbInfoMapper;
 
     @Override
     public void deleteByPrimaryKey(String id) {
@@ -315,6 +318,22 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
             String info = MessageTemplateUtil.getUnusedSbSuccessVmHtmlContent(
                     BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
             sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
+
+            //审核通过同步设备信息
+            SbUnusedDetailDTO queryDetail = new SbUnusedDetailDTO();
+            queryDetail.setSbUnusedId(unused.getId());
+            List<SbUnusedDetailVO> detailVOS = sbUnusedDetailMapper.selectList(queryDetail);
+            if (detailVOS!=null&&detailVOS.size()>0) {
+                List<SbInfoDTO> sbInfoDTOS = new ArrayList<>();
+                for (SbUnusedDetailVO vo : detailVOS) {
+                    SbInfoDTO sbInfo = new SbInfoDTO();
+                    sbInfo.setId(vo.getSbId());
+                    sbInfo.setPositionId(vo.getNewPositionId());
+                    sbInfo.setPositionNo(vo.getNewPositionNo());
+                    sbInfoDTOS.add(sbInfo);
+                }
+                sbInfoMapper.updateUnusedBatch(sbInfoDTOS);
+            }
         }
 
         upd.setId(unused.getId());