优化

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

@@ -21,10 +21,6 @@ import javax.persistence.Transient;
 @Accessors(chain = true)
 @Table(name = "t_sb_unused_detail")
 public class SbUnusedDetail implements Serializable{
-    private String sbName;
-    private String positionNo;
-    private String ggxh;
-    private String sbNo;
 
     /**
      *

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

@@ -21,6 +21,8 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class SbUnusedDetailVO extends BaseVO implements Serializable{
+    private String positionName;
+
     private String sbName;
 
     private String ggxh;

platform-dao/src/main/resources/mapper/sbUnused/SbUnusedMapper.xml

@@ -60,7 +60,7 @@
                     and unused.verity_user_id = #{verityUserId}
                 </if>
                             <if test="keyword != null and keyword != ''">
-            and unused.id like concat(concat('%',#{keyword}),'%')
+            and unused.name like concat(concat('%',#{keyword}),'%')
         </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.sbUnused.SbUnusedDTO" resultType="com.platform.dao.vo.query.sbUnused.SbUnusedVO">

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

@@ -53,8 +53,10 @@
         </if>
     </sql>
     <select id="selectList" parameterType="com.platform.dao.dto.sbUnuseddetail.SbUnusedDetailDTO" resultType="com.platform.dao.vo.query.sbUnuseddetail.SbUnusedDetailVO">
-        select unusedDetails.*
-        from t_sb_unused_detail as unusedDetails
+        select unusedDetails.*,sbInfo.name as sbName,sbInfo.position_no,sbinfo.no as sbNo,position.name as positionName
+        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
                                                                                                                                                             <where>
             <include refid="List_Condition" />
         </where>

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

@@ -13,12 +13,14 @@ import com.platform.dao.dto.sbUnusedVerifyRecord.SbUnusedVerifyRecordDTO;
 import com.platform.dao.dto.sbUnuseddetail.SbUnusedDetailDTO;
 import com.platform.dao.entity.sbUnusedVerifyRecord.SbUnusedVerifyRecord;
 import com.platform.dao.entity.sbUnuseddetail.SbUnusedDetail;
+import com.platform.dao.entity.upms.SysUser;
 import com.platform.dao.enums.SbUnusedStatusEnum;
 import com.platform.dao.enums.SysConfigEnum;
 import com.platform.dao.enums.WorkplaceBacklogDetailTypeEnum;
 import com.platform.dao.enums.WorkplaceBacklogTypeEnum;
 import com.platform.dao.mapper.sbUnusedVerifyRecord.SbUnusedVerifyRecordMapper;
 import com.platform.dao.mapper.sbUnuseddetail.SbUnusedDetailMapper;
+import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.util.MessageTemplateUtil;
 import com.platform.dao.vo.query.project.ProjectVO;
 import com.platform.dao.vo.query.sbUnused.SbUnusedVO;
@@ -29,6 +31,7 @@ import com.platform.dao.vo.query.sbUnusedVerifyRecord.SbUnusedVerifyRecordVO;
 import com.platform.dao.vo.query.sbUnuseddetail.SbUnusedDetailVO;
 import com.platform.service.event.WorkplaceBacklogEvent;
 import com.platform.service.sbUnused.SbUnusedService;
+import com.platform.service.util.SendMessageUtils;
 import org.springframework.stereotype.Service;
 import com.platform.service.base.impl.BaseServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +56,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
 
     private SbUnusedDetailMapper sbUnusedDetailMapper;
     private SbUnusedVerifyRecordMapper sbUnusedVerifyRecordMapper;
+    private SysUserMapper sysUserMapper;
 
     @Override
     public void modModelByDTO(SbUnusedDTO model) {
@@ -66,9 +70,6 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
             SbUnusedDetail detail = new SbUnusedDetail();
             detail.setId(IdGeneratorUtils.getObjectId());
             detail.setSbId(dto.getId());
-            detail.setSbName(dto.getName());
-            detail.setPositionNo(dto.getPositionNo());
-            detail.setSbNo(dto.getNo());
             detail.setCreatedTime(LocalDateTime.now());
             detail.setCreatedUserId(userInfo.getUserId());
             detail.setUpdateTime(LocalDateTime.now());
@@ -113,6 +114,7 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
                     BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
             sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
         }else if (dto.getStatus()==SbUnusedStatusEnum.verifying_two.getValue()){
+            SysUser sysUser = sysUserMapper.selectByPrimaryKey("636c57bd3abe1415981b18ec");
             upd.setVerityUserId2("636c57bd3abe1415981b18ec");
             userIds.add("636c57bd3abe1415981b18ec");//何经理
             addRecord(userInfo,unused,"审核通过",dto.getAdvice());
@@ -120,6 +122,12 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
             String info = MessageTemplateUtil.getUnusedSbVmHtmlContent(unusedUrl,
                     BeanConverterUtil.copyObjectProperties(unused,SbUnusedDTO.class));
             sendWorkplaceAndEmailNew(null,userIds,unused.getId(),info, WorkplaceBacklogDetailTypeEnum.SB_UNUSED_VERIFY.getValue());
+            String detailUrl = "/sbUnused/unused/queryById/id=" + dto.getId();
+            // 2、微信
+            String[] values = new String[]{"你有一条闲置审核任务!",unused.getApplyUserId(),DateUtils.dateToString(unused.getCreatedTime(),DateUtils.PATTERN_YMD_HMS),"他人处理申请"};
+            List<String> openIds = new ArrayList<>();
+            openIds.add(sysUser.getWxOpenId());
+            SendMessageUtils.sendWechatNew(openIds,detailUrl,values,"sVvemcNG23zivFIW5ScVVh4VcCWOSlQfhRLo7104F_o",1);
         }else if (dto.getStatus()==SbUnusedStatusEnum.success.getValue()){
             addRecord(userInfo,unused,"完成",dto.getAdvice());
             //何经理审核通过
@@ -155,9 +163,6 @@ public class SbUnusedServiceImpl extends BaseServiceImpl<SbUnusedMapper, SbUnuse
             detail.setSbUnusedId(unused.getId());
             detail.setId(IdGeneratorUtils.getObjectId());
             detail.setSbId(dto.getId());
-            detail.setSbName(dto.getName());
-            detail.setPositionNo(dto.getPositionNo());
-            detail.setSbNo(dto.getNo());
             detail.setCreatedTime(LocalDateTime.now());
             detail.setCreatedUserId(userInfo.getUserId());
             detail.setUpdateTime(LocalDateTime.now());