Browse Source

数据补全

master
zxc 3 years ago
parent
commit
4e0b7d4373
  1. 11
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java
  2. 4
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java
  3. 2
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java
  4. 34
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java
  5. 26
      epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml

11
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueAuditController.java

@ -144,4 +144,15 @@ public class IssueAuditController {
formDTO.setUserId(tokenDto.getUserId());
return new Result<PageData<AuditListResultDTO>>().ok(issueApplicationService.auditList(formDTO));
}
/**
* Desc: 补全议题审核表历史数据
* @param
* @author zxc
* @date 2022/10/10 10:55
*/
public Result initIssueApplicationHistoryData(){
issueApplicationService.initIssueApplicationHistoryData();
return new Result();
}
}

4
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/dao/IssueApplicationDao.java

@ -78,4 +78,8 @@ public interface IssueApplicationDao extends BaseDao<IssueApplicationEntity> {
List<AuditListResultDTO> auditList(AuditListFormDTO formDTO);
List<IssueApplicationDTO> initIssueApplicationHistoryData();
void updateIssueApplication(List<IssueApplicationDTO> list);
}

2
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/IssueApplicationService.java

@ -154,4 +154,6 @@ public interface IssueApplicationService extends BaseService<IssueApplicationEnt
List<String> notIssueToTopicIds(List<String> topicIdList);
PageData<AuditListResultDTO> auditList(AuditListFormDTO formDTO);
void initIssueApplicationHistoryData();
}

34
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueApplicationServiceImpl.java

@ -21,7 +21,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.dao.IssueApplicationDao;
import com.epmet.dto.IssueApplicationDTO;
@ -41,6 +45,8 @@ import com.epmet.resi.group.dto.group.result.ApplicationListResultDTO;
import com.epmet.service.IssueApplicationService;
import com.epmet.utils.ModuleConstants;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -193,4 +199,32 @@ public class IssueApplicationServiceImpl extends BaseServiceImpl<IssueApplicatio
return null;
}
@Override
public void initIssueApplicationHistoryData() {
Integer no = NumConstant.ONE;
Integer size;
do {
PageInfo<IssueApplicationDTO> pageInfo = PageHelper.startPage(no, NumConstant.ONE_HUNDRED).doSelectPageInfo(() -> baseDao.initIssueApplicationHistoryData());
List<IssueApplicationDTO> list = pageInfo.getList();
size = list.size();
if (CollectionUtils.isNotEmpty(list)){
list.forEach(l -> {
GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getGridId());
if (null == gridInfo){
throw new EpmetException("查询网格信息失败:"+l.getGridId());
}
l.setOrgId(gridInfo.getPid());
l.setOrgIdPath(gridInfo.getPids());
});
updateIssueApplication(list);
}
no++;
}while (size.compareTo(NumConstant.ONE_HUNDRED) == NumConstant.ZERO);
}
@Transactional(rollbackFor = Exception.class)
public void updateIssueApplication(List<IssueApplicationDTO> list){
baseDao.updateIssueApplication(list);
}
}

26
epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueApplicationDao.xml

@ -2,6 +2,28 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.dao.IssueApplicationDao">
<update id="updateIssueApplication">
UPDATE issue_application
<trim prefix="set" suffixOverrides=",">
<trim prefix="ORG_ID = (case" suffix="end),">
<foreach collection="list" item="i" index="index">
when ID = #{i.ID} then #{orgId}
</foreach>
</trim>
<trim prefix="ORG_ID_PATH = (case" suffix="end),">
<foreach collection="list" item="i" index="index">
when ID = #{i.ID} then #{ORG_ID_PATH}
</foreach>
</trim>
updated_time = now()
where 1=1
<trim prefix="AND ( " suffix=" )">
<foreach collection="list" separator="or" item="i" index="index" >
ID = #{i.ID}
</foreach>
</trim>
</trim>
</update>
<select id="applicationDetail" resultType="com.epmet.resi.group.dto.group.result.ApplicationDetailResultDTO">
SELECT
@ -127,4 +149,8 @@
GROUP BY issueApplicationId
</select>
<select id="initIssueApplicationHistoryData" resultType="com.epmet.dto.IssueApplicationDTO">
select * from issue_application order by created_time desc
</select>
</mapper>
Loading…
Cancel
Save