From c7d310271db8fc3277e02aac63d79408e06ec3df Mon Sep 17 00:00:00 2001 From: wenc000 <450292408@qq.com> Date: Fri, 17 Jul 2020 20:36:13 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=B8=E5=85=B3=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apis/count/CountController.java | 12 +- .../IHiddenDangerReportDao.java | 8 + .../inspection/pojo/dtos/check/CheckDTO.java | 3 +- .../pojo/dtos/enterprise/EnterpriseDTO.java | 4 +- .../service/count/ICountService.java | 9 + .../service/count/impl/CountServiceImpl.java | 285 +++++++++++++++++- .../IHiddenDangerReportService.java | 29 ++ .../impl/HiddenDangerReportServiceImpl.java | 28 ++ .../mybatis/mapper/check/check-mapper.xml | 14 +- .../mapper/enterprise/enterprise-mapper.xml | 1 + .../enterpriseofgridoperator-mapper.xml | 8 +- .../hiddendangerreport-mapper.xml | 28 ++ src/main/resources/mybatis/mybatis-config.xml | 4 + 13 files changed, 408 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/cm/inspection/controller/apis/count/CountController.java b/src/main/java/com/cm/inspection/controller/apis/count/CountController.java index 365685b..92dd2db 100644 --- a/src/main/java/com/cm/inspection/controller/apis/count/CountController.java +++ b/src/main/java/com/cm/inspection/controller/apis/count/CountController.java @@ -144,9 +144,19 @@ public class CountController extends AbstractController { @ApiImplicitParam(name = "year", value = "年份", paramType = "path"), }) @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) - @GetMapping("countCheckDetailTable/{year}") + @GetMapping("countcheckdetailtable/{year}") public SuccessResultData> countCheckDetailTable(@PathVariable("year") String year) { return countService.countCheckDetailTable(year); } + @ApiOperation(value = "隐患上报详情表", notes = "隐患上报详情表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "year", value = "年份", paramType = "path"), + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("counthiddendangerreportdetail/{year}") + public SuccessResultData> countHiddenDangerReportDetail(@PathVariable("year") String year) { + return countService.countHiddenDangerReportDetail(year); + } + } diff --git a/src/main/java/com/cm/inspection/dao/hiddendangerreport/IHiddenDangerReportDao.java b/src/main/java/com/cm/inspection/dao/hiddendangerreport/IHiddenDangerReportDao.java index 4b0d239..163637d 100644 --- a/src/main/java/com/cm/inspection/dao/hiddendangerreport/IHiddenDangerReportDao.java +++ b/src/main/java/com/cm/inspection/dao/hiddendangerreport/IHiddenDangerReportDao.java @@ -83,4 +83,12 @@ public interface IHiddenDangerReportDao { */ List listCheckItemByCheckId(Map params) throws SearchException; + /** + * 隐患上报简单列表 + * + * @param params + * @return + * @throws SearchException + */ + List listHiddenDangerReportSimple(Map params) throws SearchException; } diff --git a/src/main/java/com/cm/inspection/pojo/dtos/check/CheckDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/check/CheckDTO.java index 646d177..3c4b2b1 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/check/CheckDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/check/CheckDTO.java @@ -6,6 +6,7 @@ import com.cm.inspection.pojo.vos.hiddendangerreport.HiddenDangerReportVO; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; import java.util.ArrayList; import java.util.List; @@ -17,7 +18,7 @@ import java.util.List; * @Version: 1.0 **/ @ApiModel -public class CheckDTO { +public class CheckDTO implements Serializable { @ApiModelProperty(name = "checkId", value = "主键") private String checkId; diff --git a/src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterpriseDTO.java b/src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterpriseDTO.java index d2f44ea..e2c3414 100644 --- a/src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterpriseDTO.java +++ b/src/main/java/com/cm/inspection/pojo/dtos/enterprise/EnterpriseDTO.java @@ -3,6 +3,8 @@ package com.cm.inspection.pojo.dtos.enterprise; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import java.io.Serializable; + /** * @ClassName: EnterpriseDTO * @Description: 企业 @@ -11,7 +13,7 @@ import io.swagger.annotations.ApiModelProperty; * @Version: 1.0 **/ @ApiModel -public class EnterpriseDTO { +public class EnterpriseDTO implements Serializable { @ApiModelProperty(name = "enterpriseId", value = "主键") private String enterpriseId; diff --git a/src/main/java/com/cm/inspection/service/count/ICountService.java b/src/main/java/com/cm/inspection/service/count/ICountService.java index 4e1a8e1..f37c2b6 100644 --- a/src/main/java/com/cm/inspection/service/count/ICountService.java +++ b/src/main/java/com/cm/inspection/service/count/ICountService.java @@ -63,4 +63,13 @@ public interface ICountService { * @throws SearchException */ SuccessResultData> countCheckDetailTable(String year) throws SearchException; + + /** + * 隐患上报详情表 + * + * @param year + * @return + * @throws SearchException + */ + SuccessResultData> countHiddenDangerReportDetail(String year) throws SearchException; } diff --git a/src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java b/src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java index b0d1c2d..a37931c 100644 --- a/src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/count/impl/CountServiceImpl.java @@ -4,25 +4,32 @@ import com.cm.common.exception.SearchException; import com.cm.common.plugin.pojo.dtos.datadictionary.DataDictionaryDTO; import com.cm.common.plugin.service.datadictionary.IDataDictionaryService; import com.cm.common.result.SuccessResultData; +import com.cm.common.utils.HashMapUtil; import com.cm.inspection.pojo.dtos.check.CheckDTO; +import com.cm.inspection.pojo.dtos.checkitem.CheckItemDTO; +import com.cm.inspection.pojo.dtos.checkitemoption.CheckItemOptionDTO; import com.cm.inspection.pojo.dtos.gridpersonnel.GridPersonnelDTO; +import com.cm.inspection.pojo.dtos.hiddendangerreport.HiddenDangerReportDTO; import com.cm.inspection.service.BaseService; import com.cm.inspection.service.check.ICheckService; +import com.cm.inspection.service.checkitem.ICheckItemService; +import com.cm.inspection.service.checkitemoption.ICheckItemOptionService; import com.cm.inspection.service.checkplan.ICheckPlanService; import com.cm.inspection.service.count.ICountService; import com.cm.inspection.service.enterprise.IEnterpriseService; import com.cm.inspection.service.enterpriseofgridoperator.IEnterpriseOfGridOperatorService; import com.cm.inspection.service.gridpersonnel.IGridPersonnelService; +import com.cm.inspection.service.hiddendangerreport.IHiddenDangerReportService; import com.cm.inspection.service.process.IProcessService; import org.activiti.engine.task.Task; +import org.apache.commons.lang3.StringUtils; +import org.joda.time.DateTime; +import org.joda.time.format.DateTimeFormat; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; +import java.util.*; /** * When you feel like quitting. Think about why you started @@ -51,6 +58,12 @@ public class CountServiceImpl extends BaseService implements ICountService { private IEnterpriseOfGridOperatorService enterpriseOfGridOperatorService; @Autowired private IProcessService processService; + @Autowired + private IHiddenDangerReportService hiddenDangerReportService; + @Autowired + private ICheckItemOptionService checkItemOptionService; + @Autowired + private ICheckItemService checkItemService; @Override public SuccessResultData> countWorkTable(String startDate, String endDate) throws SearchException { @@ -171,7 +184,7 @@ public class CountServiceImpl extends BaseService implements ICountService { List areaDTOs = dataDictionaryService.listDictionaryByParentId("3f62e230-47a5-4ad9-ab01-08fd2c5218d8"); List> resultList = new ArrayList<>(); for (DataDictionaryDTO areaDTO : areaDTOs) { - Map resultListMap = getHashMap(10); + Map resultListMap = getHashMap(16); resultListMap.put("areaName", areaDTO.getDictionaryName()); // 地区认领企业总数 Integer enterpriseReceiveCount = countEnterpriseOfArea(areaDTO.getDictionaryId(), year); @@ -184,18 +197,28 @@ public class CountServiceImpl extends BaseService implements ICountService { // 实际检查企业统计 Integer checkCount = getCheckCountByYear(userIdList, year); resultListMap.put("checkCount", checkCount); - resultListMap.put("completeRatio", checkPlanCount == null ? 0 : new BigDecimal((double) checkCount / checkPlanCount).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); + resultListMap.put("completeRatio", checkPlanCount == null || checkPlanCount == 0 ? 0 : new BigDecimal((double) checkCount / checkPlanCount).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); // 待复查企业 List listNeedReCheck = listNeedReCheckIds(userIdList); List checkDTOs = listNeedReCheck(listNeedReCheck, year); resultListMap.put("needReCheck", checkDTOs.size()); // 超期企业 - - // 企业隐患总数 - // 隐患整改总数 + resultListMap.put("countTimeoutCheck", countTimeoutCheck(checkDTOs)); + // 获取隐患列表 + List checkItemOptionDTOs = listCheckItemOptionDTO(); + // 企业检查隐患总数 + Integer countCheckHiddenDanger = countCheckHiddenDanger(checkItemOptionDTOs, userIdList, year); + resultListMap.put("countCheckHiddenDanger", countCheckHiddenDanger); + // 企业复查隐患总数 + Integer countReCheckHiddenDanger = countReCheckHiddenDanger(checkItemOptionDTOs, userIdList, year); + // 复查整改总数 + Integer countRectification = countCheckHiddenDanger - countReCheckHiddenDanger; + resultListMap.put("countRectification", countRectification); // 整改率 + resultListMap.put("rectificationRate", countCheckHiddenDanger == null || countCheckHiddenDanger == 0 ? 0 : new BigDecimal((double) countRectification / countCheckHiddenDanger).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()); // 不配合次数（上报条数） - + Integer countUnCoordination = countUnCoordination(userIdList, year); + resultListMap.put("countUnCoordination", countUnCoordination); resultList.add(resultListMap); } Map result = getHashMap(5); @@ -204,7 +227,239 @@ public class CountServiceImpl extends BaseService implements ICountService { return new SuccessResultData<>(result); } + @Override + public SuccessResultData> countHiddenDangerReportDetail(String year) throws SearchException { + LOG.debug("获取三级区域"); + List areaDTOs = dataDictionaryService.listDictionaryByParentId("3f62e230-47a5-4ad9-ab01-08fd2c5218d8"); + // 获取检查项列表 + List checkItemDTOs = listCheckItemDTO(); + // 检查项详细列表 + List checkItemOptionDTOs = listCheckItemOptionDTO(); + // 组合检查项 + List> resultList = new ArrayList<>(); + for (DataDictionaryDTO areaDTO : areaDTOs) { + Map resultListMap = getHashMap(3); + resultListMap.put("areaName", areaDTO.getDictionaryName()); + // 网格员的Id列表 + List userIdList = listGridPersonnelUserId(areaDTO.getDictionaryId()); + List listHiddenDangerReport = hiddenDangerReportService.listHiddenDangerReportSimpleByUserIdsYear(userIdList, year); + for (CheckItemOptionDTO checkItemOptionDTO : checkItemOptionDTOs) { + int checkCount = 0; + for (HiddenDangerReportDTO hiddenDangerReportDTO : listHiddenDangerReport) { + // 检查项相同 + if (StringUtils.equals(checkItemOptionDTO.getCheckItemId(), hiddenDangerReportDTO.getCheckItemId()) && + StringUtils.equals(checkItemOptionDTO.getCheckItemOptionId(), hiddenDangerReportDTO.getCheckItemOptionId())) { + checkCount++; + } + } + Map checkItemOptionMap = HashMapUtil.beanToMap(checkItemOptionDTO); + checkItemOptionMap.put("checkCount", checkCount); + } + } + return null; + } + + private List> listCheckItem(List checkItemDTOs) throws Exception { + List> checkItemMapList = new ArrayList<>(); + if (checkItemDTOs) { + return checkItemMapList; + } + // 处理一级选项 + for (CheckItemDTO checkItemDTO : checkItemDTOs) { + if (checkItemDTO.getCheckItemParentId() == null || checkItemDTO.getCheckItemParentId() == 0) { + checkItemMapList.add(HashMapUtil.beanToMap(checkItemDTO)); + } + } + // 处理二级选项 + for (Map checkItemMap : checkItemMapList) { + List> subCheckItemList = new ArrayList<>(); + for (CheckItemDTO checkItemDTO : checkItemDTOs) { + if (StringUtils.equals(checkItemMap.get("checkItemId").toString(), checkItemDTO.getCheckItemParentId())) { + subCheckItemList.add(HashMapUtil.beanToMap(checkItemDTO)); + } + } + // 处理选项 + } + } + + private void buildCheckItem(List checkItemDTOs) { + List> checkItemMapList = new ArrayList<>(); + for (CheckItemDTO checkItemDTO : checkItemDTOs) { + if (checkItemDTO.getCheckItemParentId() == null || StringUtils.equals(checkItemDTO.getCheckItemParentId(), "0")) { + + } + } + } + + /** + * 统计因不配合上报的 + * + * @param userIdList + * @param year + * @return + */ + private Integer countUnCoordination(List userIdList, String year) { + Map params = getHashMap(4); + params.put("userIdList", userIdList); + params.put("year", year); + params.put("isCoordination", 0); + return checkService.countCheck(params); + } + + /** + * 检查项列表 + * + * @return + */ + private List listCheckItemDTO() { + Map params = getHashMap(0); + return checkItemService.listCheckItem(params); + } + + /** + * 检查项列表 + * + * @return + */ + private List listCheckItemOptionDTO() { + Map params = getHashMap(0); + return checkItemOptionService.listCheckItemOption(params); + } + + /** + * 统计复查数量 + * + * @param checkItemOptionDTOs + * @param userIdList + * @param year + * @return + */ + private Integer countReCheckHiddenDanger(List checkItemOptionDTOs, List userIdList, String year) { + if (checkItemOptionDTOs.isEmpty()) { + return 0; + } + if (userIdList.isEmpty()) { + return 0; + } + List checkDTOs = listCheckDTO(userIdList, year, 2); + // 无上报记录 + if (checkDTOs.isEmpty()) { + return 0; + } + List checkIds = listCheckId(checkDTOs); + return countHiddenDanger(checkItemOptionDTOs, checkIds, year); + } + + /** + * 统计隐患问题 + * + * @param checkIds + * @return + */ + private Integer countCheckHiddenDanger(List checkItemOptionDTOs, List userIdList, String year) { + if (checkItemOptionDTOs.isEmpty()) { + return 0; + } + if (userIdList.isEmpty()) { + return 0; + } + List checkDTOs = listCheckDTO(userIdList, year, 1); + // 无上报记录 + if (checkDTOs.isEmpty()) { + return 0; + } + List checkIds = listCheckId(checkDTOs); + return countHiddenDanger(checkItemOptionDTOs, checkIds, year); + } + + /** + * 统计隐患数量 + * + * @param checkItemOptionDTOs + * @param checkIds + * @param year + * @return + */ + private Integer countHiddenDanger(List checkItemOptionDTOs, List checkIds, String year) { + int countHiddenDanger = 0; + // 获取上报的隐患列表 + List listHiddenDangerReport = hiddenDangerReportService.listHiddenDangerReportSimpleByCheckIdsAndYear(checkIds, year); + for (CheckItemOptionDTO checkItemOptionDTO : checkItemOptionDTOs) { + for (HiddenDangerReportDTO hiddenDangerReportDTO : listHiddenDangerReport) { + // 判断选择项 + if (!StringUtils.equals(checkItemOptionDTO.getCheckItemId(), hiddenDangerReportDTO.getCheckItemId())) { + continue; + } + // 判断选择结果 + if (!StringUtils.equals(checkItemOptionDTO.getCheckItemOptionId(), hiddenDangerReportDTO.getCheckItemOptionId())) { + continue; + } + // 如果是错误选择结果，进行统计 + if (checkItemOptionDTO.getIsWrong() == 1) { + countHiddenDanger++; + } + } + } + return countHiddenDanger; + } + + /** + * 检查ID列表 + * + * @param checkDTOs + * @return + */ + private List listCheckId(List checkDTOs) { + List checkIds = new ArrayList<>(); + for (CheckDTO checkDTO : checkDTOs) { + checkIds.add(checkDTO.getCheckId()); + } + return checkIds; + } + + /** + * 检查列表 + * + * @param userIdList + * @param year + * @param checkType + * @return + */ + private List listCheckDTO(List userIdList, String year, int checkType) { + Map params = getHashMap(6); + params.put("userIdList", userIdList); + params.put("year", year); + params.put("checkType", checkType); + // 用户上报的隐患列表 + return checkService.listCheckSimple(params); + } + + /** + * 统计超时的检查 + * + * @param checkDTOList + * @return + */ + private Integer countTimeoutCheck(List checkDTOList) { + if (checkDTOList == null || checkDTOList.size() == 0) { + return 0; + } + DateTime now = DateTime.now(); + int timeoutCount = 0; + for (CheckDTO checkDTO : checkDTOList) { + if (checkDTO.getRectificationDays() == null || checkDTO.getRectificationDays() == 0) { + continue; + } + String gmtCreate = checkDTO.getGmtCreate(); + DateTime gmtCreateDatetime = DateTimeFormat.forPattern("yyyy-MM-dd").parseDateTime(gmtCreate.substring(0, 10)); + DateTime endTime = gmtCreateDatetime.plusDays(checkDTO.getRectificationDays()); + if (now.isAfter(endTime)) { + timeoutCount++; + } + } + return timeoutCount; + } /** * 统计需要复查 @@ -214,11 +469,11 @@ public class CountServiceImpl extends BaseService implements ICountService { * @return */ private List listNeedReCheck(List checkIdList, String year) { - if (checkIdList.isEmpty()) { + if (checkIdList == null || checkIdList.isEmpty()) { return new ArrayList<>(); } Map params = getHashMap(4); - params.put("checkIdList", checkIdList); + params.put("checkIds", checkIdList); params.put("year", year); return checkService.listCheckSimple(params); } @@ -302,7 +557,7 @@ public class CountServiceImpl extends BaseService implements ICountService { * @return */ private Integer getCheckTotalCount(List userIdList, String startDate, String endDate) { - if (userIdList.isEmpty()) { + if (userIdList == null || userIdList.isEmpty()) { return 0; } Map params = getHashMap(7); @@ -321,7 +576,7 @@ public class CountServiceImpl extends BaseService implements ICountService { * @return */ private Integer getCheckCount(List userIdList, String startDate, String endDate) { - if (userIdList.isEmpty()) { + if (userIdList == null || userIdList.isEmpty()) { return 0; } Map params = getHashMap(7); @@ -340,7 +595,7 @@ public class CountServiceImpl extends BaseService implements ICountService { * @return */ private Integer getCheckCountByYear(List userIdList, String year) { - if (userIdList.isEmpty()) { + if (userIdList == null || userIdList.isEmpty()) { return 0; } Map params = getHashMap(7); diff --git a/src/main/java/com/cm/inspection/service/hiddendangerreport/IHiddenDangerReportService.java b/src/main/java/com/cm/inspection/service/hiddendangerreport/IHiddenDangerReportService.java index 8134bea..376e9f5 100644 --- a/src/main/java/com/cm/inspection/service/hiddendangerreport/IHiddenDangerReportService.java +++ b/src/main/java/com/cm/inspection/service/hiddendangerreport/IHiddenDangerReportService.java @@ -146,4 +146,33 @@ public interface IHiddenDangerReportService { * @throws SearchException */ List listHiddenDangerReportByCheckIdAndCheckItemId(String checkId, String checkItemId) throws SearchException; + + /** + * 检查项上报列表（通过检查ID列表和year） + * + * @param checkIds + * @param year + * @return + * @throws SearchException + */ + List listHiddenDangerReportSimpleByCheckIdsAndYear(List checkIds, String year) throws SearchException; + + /** + * 检查项上报列表（通过year) + * + * @param year + * @return + * @throws SearchException + */ + List listHiddenDangerReportSimpleByYear(String year) throws SearchException; + + /** + * 检查项上报列表（通过用户列表和年份) + * + * @param userIds + * @param year + * @return + * @throws SearchException + */ + List listHiddenDangerReportSimpleByUserIdsYear(List userIds, String year) throws SearchException; } diff --git a/src/main/java/com/cm/inspection/service/hiddendangerreport/impl/HiddenDangerReportServiceImpl.java b/src/main/java/com/cm/inspection/service/hiddendangerreport/impl/HiddenDangerReportServiceImpl.java index 8587ee5..3fa9ad9 100644 --- a/src/main/java/com/cm/inspection/service/hiddendangerreport/impl/HiddenDangerReportServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/hiddendangerreport/impl/HiddenDangerReportServiceImpl.java @@ -167,4 +167,32 @@ public class HiddenDangerReportServiceImpl extends BaseService implements IHidde return hiddenDangerReportDao.listHiddenDangerReport(params); } + @Override + public List listHiddenDangerReportSimpleByCheckIdsAndYear(List checkIds, String year) throws SearchException { + if(checkIds == null || checkIds.isEmpty()) { + return new ArrayList<>(); + } + Map params = getHashMap(3); + params.put("checkIds", checkIds); + params.put("year", year); + return hiddenDangerReportDao.listHiddenDangerReportSimple(params); + } + + @Override + public List listHiddenDangerReportSimpleByYear(String year) throws SearchException { + Map params = getHashMap(2); + params.put("year", year); + return hiddenDangerReportDao.listHiddenDangerReportSimple(params); + } + + @Override + public List listHiddenDangerReportSimpleByUserIdsYear(List userIds, String year) throws SearchException { + if(userIds == null || userIds.isEmpty()) { + return new ArrayList<>(); + } + Map params = getHashMap(2); + params.put("userIds", userIds); + params.put("year", year); + return hiddenDangerReportDao.listHiddenDangerReportSimple(params); + } } diff --git a/src/main/resources/mybatis/mapper/check/check-mapper.xml b/src/main/resources/mybatis/mapper/check/check-mapper.xml index 6c4b5c4..27894f0 100644 --- a/src/main/resources/mybatis/mapper/check/check-mapper.xml +++ b/src/main/resources/mybatis/mapper/check/check-mapper.xml @@ -1,6 +1,7 @@ + @@ -39,7 +40,7 @@ - + INSERT INTO gen_check( check_id, enterprise_id, @@ -80,7 +81,7 @@ - + UPDATE gen_check SET @@ -95,7 +96,7 @@ - + UPDATE gen_check SET @@ -411,6 +412,13 @@ #{checkIds[${index}]} + + AND + creator IN + + #{userIdList[${index}]} + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/enterprise/enterprise-mapper.xml b/src/main/resources/mybatis/mapper/enterprise/enterprise-mapper.xml index 41c5116..e79f434 100644 --- a/src/main/resources/mybatis/mapper/enterprise/enterprise-mapper.xml +++ b/src/main/resources/mybatis/mapper/enterprise/enterprise-mapper.xml @@ -1,6 +1,7 @@ + diff --git a/src/main/resources/mybatis/mapper/enterpriseofgridoperator/enterpriseofgridoperator-mapper.xml b/src/main/resources/mybatis/mapper/enterpriseofgridoperator/enterpriseofgridoperator-mapper.xml index 3b95140..bf64f2f 100644 --- a/src/main/resources/mybatis/mapper/enterpriseofgridoperator/enterpriseofgridoperator-mapper.xml +++ b/src/main/resources/mybatis/mapper/enterpriseofgridoperator/enterpriseofgridoperator-mapper.xml @@ -67,7 +67,7 @@ - + INSERT INTO gen_enterprise_of_grid_operator( enterprise_of_grid_operator_id, user_id, @@ -90,7 +90,7 @@ - + UPDATE gen_enterprise_of_grid_operator SET @@ -105,7 +105,7 @@ - + DELETE FROM gen_enterprise_of_grid_operator WHERE @@ -123,7 +123,7 @@ - + UPDATE gen_enterprise_of_grid_operator SET diff --git a/src/main/resources/mybatis/mapper/hiddendangerreport/hiddendangerreport-mapper.xml b/src/main/resources/mybatis/mapper/hiddendangerreport/hiddendangerreport-mapper.xml index d6222f2..8a570ae 100644 --- a/src/main/resources/mybatis/mapper/hiddendangerreport/hiddendangerreport-mapper.xml +++ b/src/main/resources/mybatis/mapper/hiddendangerreport/hiddendangerreport-mapper.xml @@ -264,4 +264,32 @@ t1.type + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mybatis-config.xml b/src/main/resources/mybatis/mybatis-config.xml index 5e7e86d..8c44a63 100644 --- a/src/main/resources/mybatis/mybatis-config.xml +++ b/src/main/resources/mybatis/mybatis-config.xml @@ -2,6 +2,10 @@ + + + +