岗位：操作时间，机构：委员会编辑，项目合规：查询

2022-03-18 16:39:37 +08:00
parent e917c949fc
commit e7ccb5c4d7
8 changed files with 986 additions and 960 deletions
@@ -92,4 +92,6 @@ public class TsPosition extends BaseEntity {

    @TableField(exist = false)
    private  Integer total;
+
+    
 }
@@ -9,6 +9,7 @@ import com.adc.da.slrs.sarPosition.service.ITsPositionService;
 import com.adc.da.slrs.sarRole.entity.TsRole;
 import com.adc.da.utils.util.ListUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -77,11 +78,19 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
        Map<String,List<String>> updateRoleIds= ListUtil.difList(tsPositionRoleVO.getRoleIds(),oldRoleIds);
        List<String> insertIds=updateRoleIds.get("insert");
        List<String> deleteIds=updateRoleIds.get("delete");
+        TsPosition tsPosition = new TsPosition();
+        UpdateWrapper<TsPosition> updateWrapper = new UpdateWrapper<>();
        for(String id:insertIds){
            tsPositionDao.insertRole(tsPositionRoleVO.getPositionId(),id);
+            updateWrapper.eq("id", tsPositionRoleVO.getPositionId());
+            tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis()));
+            baseMapper.update(tsPosition,updateWrapper);
        }
        for(String id:deleteIds){
            tsPositionDao.deleteRole(tsPositionRoleVO.getPositionId(),id);
+            updateWrapper.eq("id", tsPositionRoleVO.getPositionId());
+            tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis()));
+            baseMapper.update(tsPosition,updateWrapper);
        }
        List<TsRole> roles=getRole(tsPositionRoleVO.getPositionId());
        return Result.success(roles);
@@ -131,6 +140,7 @@ public class TsPositionServiceImpl extends ServiceImpl<TsPositionDao, TsPosition
        if(!oldPosition.getType().equals("2")){
            return Result.error("该岗位不可修改");
        }
+        tsPosition.setOperateTime(new Timestamp(System.currentTimeMillis()));
        tsPositionDao.updateById(tsPosition);
        return Result.success();
    }
@@ -54,8 +54,8 @@ public class SarStandardComplianceAssessResultController {
            QueryWrapper<SarStandardComplianceProductAssess> queryWrapper = new QueryWrapper<>();
            IPage<SarStandardComplianceProductAssess> iPage = new Page<>(eo.getCurrent(), eo.getSize());
            queryWrapper.select(" STAND_ID,ANY_VALUE(STAND_NUMBER) as STAND_NUMBER, STAND_NAME, STAND_TYPE");
-            if (eo.getStandName() != null && !eo.getStandName().trim().equals("")) {
-                queryWrapper.like("STAND_NAME", eo.getStandName().trim());
+            if (eo.getStandName() != null ) {
+                queryWrapper.like("STAND_NAME", eo.getStandName().replace(" ",""));
            }
            if (eo.getStandNumber() != null && !eo.getStandNumber().trim().equals("")) {
                queryWrapper.like("STAND_NUMBER", eo.getStandNumber().trim());
@@ -4,6 +4,7 @@ package com.adc.da.slrs.wgCommittee.dao;
 import com.adc.da.slrs.wgCommittee.entity.WgCommittee;
 import com.adc.da.slrs.wgCommittee.entity.WgCommitteeDTO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;

 import java.util.List;

@@ -23,4 +24,6 @@ public interface WgCommitteeDao extends BaseMapper<WgCommittee> {
    List<WgCommitteeDTO> getDataWk(WgCommittee wgCommittee);
    Integer getDataCountWk(WgCommittee wgCommittee);

+    String selectCommittor(@Param("str") List<String> str);
+
 }
@@ -61,8 +61,10 @@ public class WgCommitteeServiceImpl extends ServiceImpl<WgCommitteeDao, WgCommit
        iWgCommitteeService.updateById(wgCommittee);
        List<WgCommitteeUser> save=new ArrayList<>();
        if (null!=wgCommittee.getCommitteeIds() && !wgCommittee.getCommitteeIds().isEmpty()){
-            List<String> res=new ArrayList<>(Arrays.asList(wgCommittee.getCommitteeIds().split(",")));
-            res.forEach(s -> save.add(new WgCommitteeUser().setId(wgCommittee.getCommitteer()).setCommitterId(s)));
+            List<String> res=new ArrayList<>(Arrays.asList(wgCommittee.getCommitteeIds()));
+            res.forEach(s ->
+                    save.add(new WgCommitteeUser().setId(wgCommittee.getCommitteer()).setCommitterId(s))
+            );
        }
        if (iWgCommitteeUserService.updateBatchById(save)) {
            return true;
@@ -74,7 +76,12 @@ public class WgCommitteeServiceImpl extends ServiceImpl<WgCommitteeDao, WgCommit
    @Override
    public IPage<WgCommitteeDTO> getWgCommittee(WgCommittee wgCommittee) {
        Page page=new Page();
-        page.setRecords(wgCommitteeDao.getData(wgCommittee));
+        List<WgCommitteeDTO> list = wgCommitteeDao.getData(wgCommittee);
+        for (WgCommitteeDTO wgCommitteeDTO : list){
+            List<String> str = Arrays.asList(wgCommitteeDTO.getCommittorId().split(","));
+            wgCommitteeDTO.setCommittor(wgCommitteeDao.selectCommittor(str));
+        }
+        page.setRecords(list);
        page.setCurrent(wgCommittee.getPage());
        page.setSize(wgCommittee.getPageSize());
        page.setTotal(wgCommitteeDao.getDataCount(wgCommittee));
@@ -5,18 +5,9 @@
    <select id="getData" resultType="com.adc.da.slrs.wgCommittee.entity.WgCommitteeDTO">
        SELECT wg_committee.id, wg_committee.committee_name as committeeName ,wg_committee.committee_director as committeeDirector
        ,t1.UNAME as committeeDirectorName,wg_committee.committee_secretary as committeeSecretary,t2.UNAME as committeeSecretaryName,
-        wg_committee.committeer ,
-        (
-            SELECT GROUP_CONCAT(t3.UNAME) FROM wg_committee_user
-            LEFT JOIN ts_user t3 on t3.USID = wg_committee_user.committer_id
-            WHERE wg_committee_user.id = wg_committee.committeer
-        ) as committor,
-        (
-            SELECT GROUP_CONCAT(t3.USID) FROM wg_committee_user
-            LEFT JOIN ts_user t3 on t3.USID = wg_committee_user.committer_id
-            WHERE wg_committee_user.id = wg_committee.committeer
-        ) as committorId
+        wg_committee.committeer , wg_committee_user.committer_id as committorId
        from wg_committee
+        LEFT JOIN wg_committee_user ON wg_committee.committeer = wg_committee_user.id
        LEFT JOIN ts_user t1 on t1.USID = wg_committee.committee_director
        LEFT JOIN ts_user t2 on t2.USID = wg_committee.committee_secretary
        where 1=1
@@ -65,5 +56,18 @@
            and wg_committee.committee_name like concat(concat('%',#{committeeName}),'%')
        </if>
    </select>
+    <select id="selectCommittor" resultType="java.lang.String">
+        SELECT
+        group_concat( tu.UNAME SEPARATOR ',' ) as committor
+        FROM
+        ts_user tu
+        WHERE
+        tu.USID
+        IN
+        <foreach collection="str" item="USID" open="(" close=")" separator=",">
+            <!-- 每个遍历需要生成的串 -->
+            #{USID}
+        </foreach>
+    </select>

 </mapper>