suzhou-jichuang-lanhai
/
Suzhouyingji3Java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

Browse Source
zhangtao
dongdingding 1 year ago
parent 4f881e7dce
commit 7c7695ae45
12 changed files with 126 additions and 60 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BAdministrativeController.java
Unescape View File

@ -97,7 +97,7 @@ public class BAdministrativeController extends BaseController {
for (BAdministrativeTreeRequest item1 : list) {
BAdministrativeTreeRequest parentDto = new BAdministrativeTreeRequest(item1.getCounty(), item1.getSubdistrict(), item1.getInstitutionName());
for (BAdministrativeTreeRequest item2 : listsub) {
if (item2.getSubdistrict()!=null){
if (item2.getSubdistrict()!=null && !item2.getSubdistrict().equals("")){
if (item2.getSubdistrict().substring(0, 10).equals(item1.getCounty().substring(0, 10))) {
BAdministrativeTreeRequest childDto = new BAdministrativeTreeRequest(item2.getCounty(), item2.getSubdistrict(), item2.getInstitutionName());
parentDto.addChild(childDto);

37
ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanEnterpriseController.java
Unescape View File

@ -67,18 +67,43 @@ public class BPlanEnterpriseController extends BaseController {
@ApiOperation(value = "查询计划企业列表")
@GetMapping("/list")
public AjaxResult list(BPlanEnterprise bPlanEnterprise) {
List<BPlanEnterprise> list = bPlanEnterpriseService.selectBPlanEnterpriseList(bPlanEnterprise);
for (BPlanEnterprise a :list){
String enterPriseId = String.valueOf(a.getEnterpriseId());
BKeyEnterprise count = bKeyEnterpriseService.getByentCode(enterPriseId);
if (count != null) {
a.setIsPoint(1);
}else{
a.setIsPoint(2);
}
bPlanEnterpriseService.updateById(a);
}
return AjaxResult.success(list);
}
/**
* 查询计划企业表树结构
* 查询首页
*/
@ApiOperation(value = "查询计划企业表树结构")
@ApiOperation(value = "查询首页",response =BPlanEnterPriseTreeResponse.class )
@GetMapping("/tree")
public AjaxResult tree(BPlanEnterprisePageRequest req) {
List<BPlanEnterPriseTreeResponse> list = bAdministrativeService.selectBPlanEnterPriseTreeRequestRequestList(req);
int plannedEnterpriseCountSum = list.stream()
.mapToInt(BPlanEnterPriseTreeResponse::getPlannedEnterpriseCount)
.sum();
int checkEnterpriseCountSum = list.stream()
.mapToInt(BPlanEnterPriseTreeResponse::getCheckEnterpriseCount)
.sum();
double ptSum = (double) checkEnterpriseCountSum /plannedEnterpriseCountSum;
BPlanEnterPriseTreeResponse resultObject = new BPlanEnterPriseTreeResponse();
resultObject.setInstitutionName("苏州");
resultObject.setPlannedEnterpriseCount(plannedEnterpriseCountSum);
resultObject.setCheckEnterpriseCount(checkEnterpriseCountSum);
resultObject.setPt(ptSum);
list.add(resultObject);
return success(list);
// List<List<BPlanEnterPriseTreeResponse>> groupedList = list.stream()
// .collect(Collectors.groupingBy(BPlanEnterPriseTreeResponse::getCounty))
// .values()
@ -99,7 +124,7 @@ public class BPlanEnterpriseController extends BaseController {
// cascadingSelectData.add(parentDto);
// }
//}
return success(list);
}
@ -111,8 +136,8 @@ public class BPlanEnterpriseController extends BaseController {
*/
@GetMapping("{id}")
@ApiOperation(value = "通过主键查询单条计划企业表", response = BPlanEnterprise.class)
public AjaxResult getById(@PathVariable Serializable id) {
return success(bPlanEnterpriseService.getById(id));
public AjaxResult getById(@PathVariable String id) {
return success(bPlanEnterpriseService.selectById(id));
}
/**

13
ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanEnterprise.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.programManagement.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
@ -103,8 +104,6 @@ public class BPlanEnterprise implements Serializable {
private String district;
/**
* 计划年份
*/
@ -120,7 +119,6 @@ public class BPlanEnterprise implements Serializable {
private String planName;
/**
* 计划内容
*/
@ -129,11 +127,18 @@ public class BPlanEnterprise implements Serializable {
private String planContent;
/**
* 是否重点企业1：是2：否
*/
@ApiModelProperty(value = "是否重点企业1：是2：否")
private Integer isPoint;
/**
* 企业名称
*/
@TableField(exist = false)
@ApiModelProperty(value = "企业名称")
private String entprName;
}

45
ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanEnterPriseTreeResponse.java
Unescape View File

@ -11,58 +11,35 @@ import java.util.List;
* 行政区划书请求类
*/
@Data
@ApiModel("行政区划书请求类")
@ApiModel("首页请求类")
public class BPlanEnterPriseTreeResponse {
/**
* 计划id
*/
@ApiModelProperty("计划id")
private Long id;
/**
* 所在县（市，区）
*/
@ApiModelProperty("所在县（市，区）")
private String county;
/**
* 所在乡镇
* （街道）
*/
@ApiModelProperty("所在乡镇")
private String subdistrict;
private String institutionName;
/**
* 企业总数
*/
@ApiModelProperty("企业总数")
private Integer enterpriseCount;
/**
* 已计划数
* 执法计划数量
*/
@ApiModelProperty("已计划数")
@ApiModelProperty("执法计划数量")
private Integer plannedEnterpriseCount;
/**
* 已计划重点数
* 完成执法数量
*/
@ApiModelProperty("已计划重点数")
private Integer planneKeyEnterpriseCount;
@ApiModelProperty("完成执法数量")
private Integer checkEnterpriseCount;
/**
* 剩余重点数
* 百分比
*/
@ApiModelProperty("剩余重点数")
private Integer remainingKeyEnterpriseCount;
/**
* 名称
*/
@ApiModelProperty("名称")
private String institutionName;
@ApiModelProperty("百分比")
private double pt;
// private List<BPlanEnterPriseTreeResponse> children;

7
ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/BPlanEnterpriseZhifaResponse.java
Unescape View File

@ -20,13 +20,14 @@ public class BPlanEnterpriseZhifaResponse {
*/
@ApiModelProperty(value = "编号")
@Excel(name = "编号")
private Long id;
/**
* 检查表id
*/
@ApiModelProperty(value = "检查表id")
private String longId;
/**
@ -106,6 +107,7 @@ public class BPlanEnterpriseZhifaResponse {
*/
@ApiModelProperty(value = "行政区划")
@Excel(name = "行政区划")
private String district;
@ -114,6 +116,7 @@ public class BPlanEnterpriseZhifaResponse {
*/
@ApiModelProperty(value = "企业名称")
@Excel(name = "企业名称")
private String entprName;
@ -122,6 +125,7 @@ public class BPlanEnterpriseZhifaResponse {
*/
@ApiModelProperty(value = "计划年份")
@Excel(name = "计划年份")
private String plannedYear;
/**
@ -129,6 +133,7 @@ public class BPlanEnterpriseZhifaResponse {
*/
@ApiModelProperty(value = "检查状态 1=已检查，2=未检查")
@Excel(name = "检查状态",readConverterExp = "1=已检查,2=未检查")
private String checkStatus;
}

8
ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BPlanEnterpriseMapper.java
Unescape View File

@ -85,5 +85,13 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterprise> {
public List<BPlanEnterprise> selectBPlanEnterpriseList(BPlanEnterprise bPlanEnterprise);
/**
* 通过主键查询单条数据
*
* @param id 主键
* @return 单条数据
*/
BPlanEnterprise selectById(String id);
}

9
ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanEnterpriseService.java
Unescape View File

@ -79,5 +79,14 @@ public interface BPlanEnterpriseService extends IService<BPlanEnterprise> {
*/
Map<String, Object> getPlanMx(PlanMxRequest req);
/**
* 通过主键查询单条数据
*
* @param id 主键
* @return 单条数据
*/
BPlanEnterprise selectById(String id);
}

5
ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanEnterpriseServiceImpl.java
Unescape View File

@ -98,6 +98,11 @@ public class BPlanEnterpriseServiceImpl extends ServiceImpl<BPlanEnterpriseMappe
return result;
}
@Override
public BPlanEnterprise selectById(String id) {
return bPlanEnterpriseMapper.selectById(id);
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/SzEntBasicInfoServiceImpl.java
Unescape View File

@ -103,7 +103,7 @@ public class SzEntBasicInfoServiceImpl implements ISzEntBasicInfoService
@Override
public Map<String, Object> page(SzEntBasicInfoPageRequest req) {
PageHelper.startPage(1,10);
PageHelper.startPage(req.getPageNum(),req.getPageSize());
List<SzEntBasicInfo> szEntBasicInfos = szEntBasicInfoMapper.page(req);
PageInfo<SzEntBasicInfo> pageInfo = new PageInfo<>(szEntBasicInfos);
Map<String, Object> result =new HashMap<>();

34
ruoyi-system/src/main/resources/mapper/yingji/BAdministrativeMapper.xml
Unescape View File

@ -52,22 +52,32 @@
<select id="selectBPlanEnterPriseTreeRequestRequestList"
resultType="com.ruoyi.programManagement.entity.request.BPlanEnterPriseTreeResponse">
SELECT a.subdistrict AS subdistrict,a.county,c.id,a.institution_name as institutionName,
COUNT(b.subdistrict) AS enterpriseCount,
COUNT(DISTINCT k.ent_code) - COUNT(DISTINCT c.enterprise_id) AS remainingKeyEnterpriseCount,
COUNT(DISTINCT c.enterprise_id) AS plannedEnterpriseCount,
COUNT(DISTINCT CASE WHEN k.ent_code IS NOT NULL THEN c.enterprise_id END) AS planneKeyEnterpriseCount
FROM b_administrative a
LEFT JOIN sz_ent_basic_info b ON a.subdistrict = LPAD(b.subdistrict, LENGTH(a.subdistrict), '0')
LEFT JOIN b_key_enterprise k ON a.subdistrict = k.district
LEFT JOIN b_plan_enterprise c ON k.ent_code = c.enterprise_id
WHERE a.SUBDISTRICT LIKE '%13205%'
-- SELECT a.subdistrict AS subdistrict,a.county,c.id,a.institution_name as institutionName,
-- COUNT(b.subdistrict) AS enterpriseCount,
-- COUNT(DISTINCT k.ent_code) - COUNT(DISTINCT c.enterprise_id) AS remainingKeyEnterpriseCount,
-- COUNT(DISTINCT c.enterprise_id) AS plannedEnterpriseCount,
-- COUNT(DISTINCT CASE WHEN k.ent_code IS NOT NULL THEN c.enterprise_id END) AS planneKeyEnterpriseCount
-- FROM b_administrative a
-- LEFT JOIN sz_ent_basic_info b ON a.subdistrict = LPAD(b.subdistrict, LENGTH(a.subdistrict), '0')
-- LEFT JOIN b_key_enterprise k ON a.subdistrict = k.district
-- LEFT JOIN b_plan_enterprise c ON k.ent_code = c.enterprise_id
-- WHERE a.SUBDISTRICT LIKE '%13205%'
select s.institutionName ,s.plannedEnterpriseCount,s.checkEnterpriseCount,s.pt from (SELECT
a. institution_name AS institutionName,
COUNT(DISTINCT b.enterprise_id) AS plannedEnterpriseCount,
COUNT(DISTINCT c.USC_CODE) AS checkEnterpriseCount,
COUNT(DISTINCT c.USC_CODE) / COUNT(DISTINCT b.enterprise_id) AS pt
FROM
b_administrative a
LEFT JOIN b_plan_enterprise b ON SUBSTRING(a.county, 1, 8) = SUBSTRING(b.district, 1, 8)
LEFT JOIN sz_enfor_examine c ON b.enterprise_id = c.USC_CODE
<where>
<if test="req.plannedYear!=null and req.plannedYear!=''">
c.planned_year#{req.plannedYear}
b.planned_year#{req.plannedYear}
</if>
</where>
GROUP BY a.subdistrict,a.county;
GROUP BY SUBSTRING(a.county, 1, 8) )s
where s. institutionName!='苏州市'
</select>

21
ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml
Unescape View File

@ -175,6 +175,27 @@
</if>
</where>
</select>
<select id="selectById" resultType="com.ruoyi.programManagement.entity.BPlanEnterprise">
select a.id,
a.enterprise_id,
a.create_id,
a.create_by,
a.create_time,
a.update_id,
a.update_by,
a. update_time,
a. remark,
a.user_id,
a. dept_id,
a.district,
a.planned_year,
a.plan_name,
a.plan_content,
a.is_point,
b.ENTPR_NAME as entprName
from b_plan_enterprise a left join sz_ent_basic_info b on a.enterprise_id=b.usc_code
where a.id=#{id}
</select>
</mapper>

3
ruoyi-system/src/main/resources/mapper/yingji/SzEntBasicInfoMapper.xml
Unescape View File

@ -316,7 +316,8 @@
) AS s
WHERE s.is_point = 1
</select>
<select id="page" resultType="com.ruoyi.programManagement.entity.SzEntBasicInfo">select s.* from(
<select id="page" resultType="com.ruoyi.programManagement.entity.SzEntBasicInfo">
select s.* from(
SELECT
a.*,
CASE WHEN b.ent_code IS NOT NULL THEN 1 ELSE 2 END AS is_point

Write Preview
Loading…
Cancel
Save