Skip to content

A
amos-boot-biz
Commit 68fe9817 authored by tianyiming's avatar tianyiming
Browse files
Options

一码通总览统计修改

parent d85b1ddd
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 63 deletions
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/mapper/EquipmentCategoryMapper.java
View file @ 68fe9817
......@@ -20,8 +20,7 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
@Select("select * from tz_equipment_category where code in('1000','2000','3000','4000','5000','6000','8000','9000')")
List<EquipmentCategoryDto> selectClassify();
List<Map<String, Object>> getCategoryCount(@Param("level") String level,
@Param("orgCode") String orgCode, @Param("companyCode") String companyCode);
List<Map<String, Object>> getCategoryCount( @Param("companyCode") String companyCode);
Map<String, Object> getAdministrativeDivision(@Param("division") String division, @Param("county") String county);
......
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/resources/mapper/EquipmentCategoryMapper.xml
View file @ 68fe9817
......@@ -28,14 +28,7 @@
LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjui.RECORD = ibjoi.RECORD
WHERE
ibjoi.claim_status = '待认领'
<if test="level == 'company'">
AND ibjui."USE_UNIT_CREDIT_CODE"
LIKE CONCAT('%',#{companyCode},'%')
</if>
<if test="level != 'company'">
AND ibjsi."ORG_BRANCH_CODE"
LIKE CONCAT('%',#{orgCode},'%')
</if>
AND ibjui."USE_UNIT_CREDIT_CODE" = #{companyCode}
GROUP BY
"EQU_LIST"
) A on temp.code = A."EQU_LIST" LEFT JOIN (
......@@ -49,14 +42,7 @@
LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjui.RECORD = ibjoi.RECORD
WHERE
ibjoi.claim_status = '已认领'
<if test="level == 'company'">
AND ibjui."USE_UNIT_CREDIT_CODE"
LIKE CONCAT('%',#{companyCode},'%')
</if>
<if test="level != 'company'">
AND ibjsi."ORG_BRANCH_CODE"
LIKE CONCAT('%',#{orgCode},'%')
</if>
AND ibjui."USE_UNIT_CREDIT_CODE" = #{companyCode}
GROUP BY
"EQU_LIST"
) b ON temp.code = b."EQU_LIST"
......@@ -71,14 +57,7 @@
LEFT JOIN idx_biz_jg_other_info ibjoi ON ibjui.RECORD = ibjoi.RECORD
WHERE
ibjoi.claim_status = '已拒领'
<if test="level == 'company'">
AND ibjui."USE_UNIT_CREDIT_CODE"
LIKE CONCAT('%',#{companyCode},'%')
</if>
<if test="level != 'company'">
AND ibjsi."ORG_BRANCH_CODE"
LIKE CONCAT('%',#{orgCode},'%')
</if>
AND ibjui."USE_UNIT_CREDIT_CODE" = #{companyCode}
GROUP BY
"EQU_LIST"
) C ON temp.code = C."EQU_LIST"
......@@ -151,7 +130,7 @@
<select id="getAllUnit" resultType="java.util.Map">
SELECT
DISTINCT (USE_UNIT_CREDIT_CODE) use_code,
ORG_BRANCH_CODE supervise_org_code
ifnull(ORG_BRANCH_CODE,50) supervise_org_code
FROM
idx_biz_jg_use_info ibjui
LEFT JOIN idx_biz_jg_supervision_info ibjsi ON ibjui."RECORD" = ibjsi."RECORD"
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/EquipmentCategoryServiceImpl.java
View file @ 68fe9817
......@@ -13,20 +13,11 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.ESEquipmentCategoryDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.EquInfoDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.EquipmentCategoryDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.CategoryOtherInfo;
import com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategory;
import com.yeejoin.amos.boot.module.tzs.api.entity.EquipmentCategoryData;
import com.yeejoin.amos.boot.module.tzs.api.entity.SupervisoryCodeInfo;
import com.yeejoin.amos.boot.module.tzs.api.entity.UseInfo;
import com.yeejoin.amos.boot.module.tzs.api.entity.*;
import com.yeejoin.amos.boot.module.tzs.api.enums.EquimentEnum;
import com.yeejoin.amos.boot.module.tzs.api.enums.EquipmentCategoryEnum;
import com.yeejoin.amos.boot.module.tzs.api.enums.EquipmentClassifityEnum;
import com.yeejoin.amos.boot.module.tzs.api.mapper.CategoryOtherInfoMapper;
import com.yeejoin.amos.boot.module.tzs.api.mapper.EquipmentCategoryDataMapper;
import com.yeejoin.amos.boot.module.tzs.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.boot.module.tzs.api.mapper.SuperviseInfoMapper;
import com.yeejoin.amos.boot.module.tzs.api.mapper.SupervisoryCodeInfoMapper;
import com.yeejoin.amos.boot.module.tzs.api.mapper.UseInfoMapper;
import com.yeejoin.amos.boot.module.tzs.api.mapper.*;
import com.yeejoin.amos.boot.module.tzs.api.service.IEquipmentCategoryService;
import com.yeejoin.amos.boot.module.tzs.biz.dao.ESEquipmentCategory;
import com.yeejoin.amos.boot.module.tzs.biz.utils.JsonUtils;
......@@ -67,16 +58,7 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.StringJoiner;
import java.util.*;
import java.util.stream.Collectors;
/**
......@@ -830,16 +812,16 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
List<Map<String, Object>> allUnitList = equipmentCategoryMapper.getAllUnit(unitCodes);
for (Map<String, Object> map : allUnitList) {
EquipmentCategoryData equipmentCategoryData = new EquipmentCategoryData();
equipmentCategoryData.setOrgBranchCode(map.get("supervise_org_code").toString());
equipmentCategoryData.setUnitCode(map.get("use_code").toString());
List<Map<String, Object>> listMap = equipmentCategoryMapper.getCategoryCount("company", null, map.get("use_code").toString());
equipmentCategoryData.setOrgBranchCode(String.valueOf(map.get("supervise_org_code")));
equipmentCategoryData.setUnitCode(String.valueOf(map.get("use_code")));
List<Map<String, Object>> listMap = equipmentCategoryMapper.getCategoryCount(String.valueOf(map.get("use_code")));
for (Map<String, Object> dataMap : listMap) {
Map<String, Object> data = new HashMap<>();
data.put("waitClaim", dataMap.get("waitClaim"));
data.put("alreadyClaim", dataMap.get("alreadyClaim"));
data.put("refuseClaim", dataMap.get("refuseClaim"));
JSONObject jsonObject = new JSONObject(data);
switch (dataMap.get("category").toString()) {
switch (String.valueOf(dataMap.get("category"))) {
case "1000":
equipmentCategoryData.setBoiler(jsonObject + "");
break;
......@@ -866,11 +848,15 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
break;
}
}
boolean b = equipmentCategoryDataService.saveOrUpdate(equipmentCategoryData,
new QueryWrapper<EquipmentCategoryData>().eq("unit_code", equipmentCategoryData.getUnitCode()));
if (b) {
list.add(equipmentCategoryData);
}
if(ObjectUtils.isEmpty(unitCodes)){
equipmentCategoryDataService.saveBatch(list);
} else {
for (EquipmentCategoryData equipmentCategoryData : list) {
equipmentCategoryDataService.update(equipmentCategoryData,
new QueryWrapper<EquipmentCategoryData>().eq("unit_code", equipmentCategoryData.getUnitCode()));
}
}
return list;
}
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzsAppService.java
View file @ 68fe9817
......@@ -8,11 +8,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.tzs.api.common.CommonException;
import com.yeejoin.amos.boot.module.tzs.api.common.MobileLoginParam;
......@@ -24,7 +22,6 @@ import com.yeejoin.amos.boot.module.tzs.api.mapper.EquipmentCategoryMapper;
import com.yeejoin.amos.boot.module.tzs.api.mapper.ViewJgClaimMapper;
import com.yeejoin.amos.boot.module.tzs.biz.utils.HttpUtils;
import com.yeejoin.amos.boot.module.tzs.biz.utils.JsonUtils;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitInfo;
import com.yeejoin.amos.boot.module.tzs.flc.api.feign.IdxFeignService;
import com.yeejoin.amos.boot.module.tzs.flc.api.mapper.RegUnitInfoMapper;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
......@@ -51,7 +48,6 @@ import org.springframework.web.multipart.MultipartFile;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
import javax.crypto.Cipher;
......@@ -62,13 +58,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.security.AlgorithmParameters;
import java.security.NoSuchProviderException;
import java.security.Security;
import java.util.*;
import java.util.stream.Collectors;
import static com.mysql.cj.jdbc.interceptors.SessionAssociationInterceptor.getSessionKey;
@Service
@Slf4j
public class TzsAppService {
......@@ -515,7 +508,7 @@ public class TzsAppService {
Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(equipCategory);
List<Map<String, Object>> mapList = resourceJson.get(EquipmentClassifityEnum.BDLS.getCode());
List<Map<String, Object>> list = new ArrayList<>();
List<Map<String, Object>> listMap = equipmentCategoryMapper.getCategoryCount("company", null, companyCode);
List<Map<String, Object>> listMap = equipmentCategoryMapper.getCategoryCount(companyCode);
for (Map<String, Object> map : mapList) {
for (Map<String, Object> map1 : listMap) {
if (map.get("code").equals(map1.get("category"))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment