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 4572cb8a6d
commit 1ad48efc32
25 changed files with 219 additions and 59 deletions
Show Stats Download Patch File Download Diff File

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

@ -69,6 +69,7 @@ public class BKeyEnterpriseController extends BaseController {
@PostMapping
@ApiOperation(value = "新增省重点企业表", response = BKeyEnterprise.class)
public AjaxResult insert(@RequestBody BKeyEnterprise bKeyEnterprise) {
bKeyEnterprise.setCreateId(getUserId());
return success(bKeyEnterpriseService.save(bKeyEnterprise));
}
@ -81,6 +82,7 @@ public class BKeyEnterpriseController extends BaseController {
@PutMapping
@ApiOperation(value = "修改省重点企业表")
public AjaxResult update(@RequestBody BKeyEnterprise bKeyEnterprise) {
bKeyEnterprise.setUpdateId(getUserId());
return success(bKeyEnterpriseService.updateById(bKeyEnterprise));
}

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

@ -1,27 +1,21 @@
package com.ruoyi.programManagement.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.programManagement.entity.BPlanEnterprise;
import com.ruoyi.programManagement.entity.request.checkResultRequest;
import com.ruoyi.programManagement.entity.response.BPlanEnterpriseZhifaResponse;
import com.ruoyi.programManagement.mapper.BPlanEnterpriseMapper;
import com.ruoyi.programManagement.service.BPlanEnterpriseService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.Serializable;
import java.util.List;
@ -44,16 +38,20 @@ public class BPlanEnterpriseController extends BaseController {
private BPlanEnterpriseService bPlanEnterpriseService;
/**
* 分页条件查询所有数据
* 计划企业表(BPlanEnterprise)表数据库访问层
*/
@Resource
private BPlanEnterpriseMapper bPlanEnterpriseMapper;
/**
* 查询所有数据
*
* @param page 分页条件
* @param bPlanEnterprise 查询条件
* @return 所有数据
*/
@GetMapping
@ApiOperation(value = "分页条件查询计划企业表", response = BPlanEnterprise.class)
public AjaxResult page(Page<BPlanEnterprise> page, BPlanEnterprise bPlanEnterprise) {
return success(bPlanEnterpriseService.page(page, new QueryWrapper<>(bPlanEnterprise)));
@ApiOperation(value = "查询计划企业表", response = BPlanEnterprise.class)
public AjaxResult page() {
return success(bPlanEnterpriseService.page());
}
/**
@ -77,6 +75,7 @@ public class BPlanEnterpriseController extends BaseController {
@PostMapping
@ApiOperation(value = "新增计划企业表", response = BPlanEnterprise.class)
public AjaxResult insert(@RequestBody BPlanEnterprise bPlanEnterprise) {
bPlanEnterprise.setCreateId(getDeptId());
return success(bPlanEnterpriseService.save(bPlanEnterprise));
}
@ -89,6 +88,7 @@ public class BPlanEnterpriseController extends BaseController {
@PutMapping
@ApiOperation(value = "修改计划企业表")
public AjaxResult update(@RequestBody BPlanEnterprise bPlanEnterprise) {
bPlanEnterprise.setUpdateId(getDeptId());
return success(bPlanEnterpriseService.updateById(bPlanEnterprise));
}
@ -107,6 +107,7 @@ public class BPlanEnterpriseController extends BaseController {
/**
* 执法结果-企业详情
*
* @param req 请求类
* @return
*/
@ -115,5 +116,18 @@ public class BPlanEnterpriseController extends BaseController {
public AjaxResult getZhifa(@Valid checkResultRequest req) {
return success(bPlanEnterpriseService.getZhifa(req));
}
/**
* 导出执法结果
*/
@ApiOperation(value = "导出执法结果")
@PostMapping("/export")
public void export(HttpServletResponse response, checkResultRequest req) {
List<BPlanEnterpriseZhifaResponse> list = bPlanEnterpriseMapper.getZhifa(req);
ExcelUtil<BPlanEnterpriseZhifaResponse> util = new ExcelUtil<BPlanEnterpriseZhifaResponse>(BPlanEnterpriseZhifaResponse.class);
util.exportExcel(response, list, "导出计划管理");
}
}

39
ruoyi-admin/src/main/java/com/ruoyi/programManagement/controller/BPlanManageController.java
Unescape View File

@ -3,12 +3,16 @@ package com.ruoyi.programManagement.controller;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.programManagement.entity.BAdministrative;
import com.ruoyi.programManagement.entity.BKeyEnterprise;
import com.ruoyi.programManagement.entity.BPlanEnterprise;
import com.ruoyi.programManagement.entity.BPlanManage;
import com.ruoyi.programManagement.entity.request.BPlanManageAddRequest;
import com.ruoyi.programManagement.entity.request.checkResultRequest;
import com.ruoyi.programManagement.entity.response.BPlanManagePageResponse;
import com.ruoyi.programManagement.entity.response.BPlanManageResponse;
import com.ruoyi.programManagement.service.BKeyEnterpriseService;
import com.ruoyi.programManagement.service.BPlanEnterpriseService;
import com.ruoyi.programManagement.service.BPlanManageService;
import io.swagger.annotations.Api;
@ -18,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
@ -41,6 +46,9 @@ public class BPlanManageController extends BaseController {
@Resource
private BPlanEnterpriseService bPlanEnterpriseService;
@Resource
private BKeyEnterpriseService bKeyEnterpriseService;
/**
* 分页条件查询所有数据
*
@ -76,6 +84,8 @@ public class BPlanManageController extends BaseController {
public AjaxResult insert(@RequestBody BPlanManageAddRequest bPlanManageAddRequest) {
BPlanManage bPlanManage = new BPlanManage();
BeanUtils.copyProperties(bPlanManageAddRequest, bPlanManage);
bPlanManage.setCreateId(getUserId());
bPlanManage.setDeptId(getDeptId());
//新增计划管理
bPlanManageService.save(bPlanManage);
//新增企业 获取企业id和计划id
@ -88,9 +98,18 @@ public class BPlanManageController extends BaseController {
String[] districtArray = district.split(",");
int i = 0;
for (String entId : idArray) {
//根据企业id查询重点企业表是 1:重点企业 ，2：非重点企业
BKeyEnterprise count = bKeyEnterpriseService.getByentCode(entId);
if (count != null) {
bPlanEnterprise.setIsPoint(1);
}else{
bPlanEnterprise.setIsPoint(2);
}
bPlanEnterprise.setPlanId(id);
bPlanEnterprise.setId(null);
bPlanEnterprise.setEnterpriseId(entId);
bPlanEnterprise.setCreateId(getUserId());
bPlanEnterprise.setDeptId(getDeptId());
bPlanEnterprise.setDistrict(districtArray[i]);
bPlanEnterpriseService.save(bPlanEnterprise);
i += 1;
@ -123,11 +142,21 @@ public class BPlanManageController extends BaseController {
//获取逗号分隔的id
String[] eidArray = enterPriseId.split(",");
for (String entId : eidArray) {
//根据企业id查询重点企业表是 1:重点企业 ，2：非重点企业
BKeyEnterprise count = bKeyEnterpriseService.getByentCode(entId);
if (count != null) {
bPlanEnterprise.setIsPoint(1);
}else{
bPlanEnterprise.setIsPoint(2);
}
bPlanEnterprise.setPlanId(id);
bPlanEnterprise.setId(null);
bPlanEnterprise.setEnterpriseId(entId);
bPlanEnterprise.setCreateId(getUserId());
bPlanEnterprise.setDeptId(getDeptId());
bPlanEnterpriseService.save(bPlanEnterprise);
}
bPlanManage.setUpdateId(getDeptId());
return success(bPlanManageService.updateById(bPlanManage));
}
@ -149,6 +178,16 @@ public class BPlanManageController extends BaseController {
}
/**
* 导出计划管理
*/
@ApiOperation(value = "导出计划管理")
@PostMapping("/export")
public void export(HttpServletResponse response, BPlanManage bPlanManage) {
List<BPlanManage> list = bPlanManageService.selectBybPlanManage(bPlanManage);
ExcelUtil<BPlanManage> util = new ExcelUtil<BPlanManage>(BPlanManage.class);
util.exportExcel(response, list, "导出计划管理");
}
}

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

@ -1,7 +1,5 @@
package com.ruoyi.programManagement.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.pagehelper.PageHelper;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.poi.ExcelUtil;

4
ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java
Unescape View File

@ -57,7 +57,7 @@ public class BKeyEnterprise implements Serializable {
* 创建者ID
*/
@ApiModelProperty(value = "创建者ID")
private Integer createId;
private Long createId;
/**
* 创建者
@ -75,7 +75,7 @@ public class BKeyEnterprise implements Serializable {
* 更新者ID
*/
@ApiModelProperty(value = "更新者ID")
private Integer updateId;
private Long updateId;
/**
* 更新者

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

@ -2,7 +2,6 @@ package com.ruoyi.programManagement.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
@ -48,7 +47,7 @@ public class BPlanEnterprise implements Serializable {
* 创建者ID
*/
@ApiModelProperty(value = "创建者ID")
private Integer createId;
private Long createId;
/**
* 创建者
@ -59,7 +58,7 @@ public class BPlanEnterprise implements Serializable {
/**
* 创建时间
*/
@Excel(name = "年份",dateFormat = "yyyy/MM/dd HH:mm:ss")
@Excel(name = "年份", dateFormat = "yyyy/MM/dd HH:mm:ss")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
@ -69,7 +68,7 @@ public class BPlanEnterprise implements Serializable {
* 更新者ID
*/
@ApiModelProperty(value = "更新者ID")
private Integer updateId;
private Long updateId;
/**
* 更新者
@ -102,12 +101,18 @@ public class BPlanEnterprise implements Serializable {
private Long deptId;
/**
* 行政区划
*/
@ApiModelProperty(value = "行政区划")
private String district;
/**
* 是否重点企业 1：是 2：否
*/
@ApiModelProperty(value = "是否重点企业 1：是 2：否")
private Integer isPoint;
}

16
ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BPlanManage.java
Unescape View File

@ -28,6 +28,7 @@ public class BPlanManage {
/**
* 编号
*/
@Excel(name = "编号")
@ApiModelProperty(value = "编号")
@TableId(type = IdType.AUTO)
private Long id;
@ -35,30 +36,35 @@ public class BPlanManage {
/**
* 计划年份
*/
@Excel(name = "计划年份")
@ApiModelProperty(value = "计划年份")
private String plannedYear;
/**
* 行政区划
*/
@Excel(name = "行政区划")
@ApiModelProperty(value = "行政区划")
private String district;
/**
* 计划企业数量
*/
@Excel(name = "计划企业数量")
@ApiModelProperty(value = "计划企业数量")
private String planNumb;
/**
* 计划标题
*/
@Excel(name = "计划标题")
@ApiModelProperty(value = "计划标题")
private String planName;
/**
* 计划内容
*/
@Excel(name = "计划内容")
@ApiModelProperty(value = "计划内容")
private String planContent;
@ -67,13 +73,13 @@ public class BPlanManage {
* 创建者ID
*/
@ApiModelProperty(value = "创建者ID")
private Integer createId;
private Long createId;
/**
* 更新者ID
*/
@ApiModelProperty(value = "更新者ID")
private Integer updateId;
private Long updateId;
/**
@ -97,7 +103,7 @@ public class BPlanManage {
/**
* 创建时间
*/
@Excel(name = "年份",dateFormat = "yyyy/MM/dd HH:mm:ss")
@Excel(name = "创建时间", dateFormat = "yyyy/MM/dd HH:mm:ss")
@ApiModelProperty("创建时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ -116,7 +122,7 @@ public class BPlanManage {
/**
* 更新时间
*/
@Excel(name = "年份",dateFormat = "yyyy/MM/dd HH:mm:ss")
@Excel(name = "更新时间", dateFormat = "yyyy/MM/dd HH:mm:ss")
@ApiModelProperty("更新时间")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ -132,6 +138,6 @@ public class BPlanManage {
* 重点企业数量
*/
@ApiModelProperty("重点企业数量")
private Integer keyCount;
private Integer keyCount;
}

4
ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/BPlanManageAddRequest.java
Unescape View File

@ -121,4 +121,8 @@ public class BPlanManageAddRequest {
*/
@ApiModelProperty("重点企业数量")
private Integer keyCount;
}

2
ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java
Unescape View File

@ -27,7 +27,7 @@ public class checkResultRequest {
/**
* 检查状态
*/
@ApiModelProperty(value = "检查状态 1=已检查，0=未检查")
@ApiModelProperty(value = "检查状态 1=已检查，2=未检查")
private Integer checkStatus;
/**
* size

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

@ -18,6 +18,7 @@ public class BPlanEnterpriseZhifaResponse {
/**
* 编号
*/
@Excel(name = "编号")
@ApiModelProperty(value = "编号")
@TableId(type = IdType.AUTO)
private Long id;
@ -25,12 +26,14 @@ public class BPlanEnterpriseZhifaResponse {
/**
* 计划id
*/
@Excel(name = "计划id")
@ApiModelProperty(value = "计划id")
private Long planId;
/**
* 企业id
*/
@Excel(name = "企业id")
@ApiModelProperty(value = "企业id")
private String enterpriseId;
@ -95,6 +98,7 @@ public class BPlanEnterpriseZhifaResponse {
/**
* 行政区划
*/
@Excel(name = "行政区划")
@ApiModelProperty(value = "行政区划")
private String district;
@ -102,6 +106,7 @@ public class BPlanEnterpriseZhifaResponse {
/**
* 企业名称
*/
@Excel(name = "企业名称")
@ApiModelProperty(value = "企业名称")
private String entprName;
@ -109,13 +114,15 @@ public class BPlanEnterpriseZhifaResponse {
/**
* 计划年份
*/
@Excel(name = "计划年份")
@ApiModelProperty(value = "计划年份")
private String plannedYear;
/**
* 检查状态
*/
@ApiModelProperty(value = "检查状态 1=已检查，0=未检查")
@Excel(name = "检查状态",readConverterExp = "1=已检查,2=未检查")
@ApiModelProperty(value = "检查状态 1=已检查，2=未检查")
private String checkStatus;
}

9
ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/BKeyEnterpriseMapper.java
Unescape View File

@ -34,5 +34,14 @@ public interface BKeyEnterpriseMapper extends BaseMapper<BKeyEnterprise> {
* @return 所有数据
*/
public List<BKeyEnterprise> page(@Param("req") BKeyEnterprisePageRequest req);
/**
* @param entCode 企业代码
* @return
*/
BKeyEnterprise getByentCode(@Param("entCode") String entCode);
}

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

@ -35,5 +35,14 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterprise> {
List<BPlanEnterpriseZhifaResponse> getZhifa(@Param("req") checkResultRequest req);
/**
* 查询所有数据
*
* @return
*/
List<BPlanEnterprise> page();
}

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

@ -38,5 +38,13 @@ public interface BPlanManageMapper extends BaseMapper<BPlanManage> {
*/
public List<BPlanManagePageResponse> page(@Param("req") checkResultRequest req);
/**
* 查询计划管理列表
* @param bPlanManage 实体类
* @return
*/
List<BPlanManage> selectBybPlanManage(BPlanManage bPlanManage);
}

7
ruoyi-admin/src/main/java/com/ruoyi/programManagement/mapper/SzEntBasicInfoMapper.java
Unescape View File

@ -1,7 +1,6 @@
package com.ruoyi.programManagement.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.programManagement.entity.SzEntBasicInfo;
import com.ruoyi.programManagement.entity.request.SzEntBasicInfoPageRequest;
import org.apache.ibatis.annotations.Param;
@ -71,6 +70,12 @@ public interface SzEntBasicInfoMapper extends BaseMapper<SzEntBasicInfo> {
List<SzEntBasicInfo> page(@Param("req") SzEntBasicInfoPageRequest req);
/**
* 计算重点企业数量
* @return
*/
Integer countIspoint();
}

14
ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BKeyEnterpriseService.java
Unescape View File

@ -1,8 +1,6 @@
package com.ruoyi.programManagement.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.programManagement.entity.BAdministrative;
import com.ruoyi.programManagement.entity.BKeyEnterprise;
import com.ruoyi.programManagement.entity.request.BKeyEnterprisePageRequest;
@ -28,11 +26,17 @@ public interface BKeyEnterpriseService extends IService<BKeyEnterprise> {
/**
* 分页条件查询所有数据
*
*
* @param req 查询条件
* @param req 查询条件
* @return 所有数据
*/
public Map<String, Object> page ( BKeyEnterprisePageRequest req);
public Map<String, Object> page(BKeyEnterprisePageRequest req);
/**
* @param entCode 企业代码
* @return
*/
BKeyEnterprise getByentCode(String entCode);
}

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

@ -1,13 +1,10 @@
package com.ruoyi.programManagement.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.programManagement.entity.BKeyEnterprise;
import com.ruoyi.programManagement.entity.BPlanEnterprise;
import com.ruoyi.programManagement.entity.BPlanManage;
import com.ruoyi.programManagement.entity.request.BKeyEnterprisePageRequest;
import com.ruoyi.programManagement.entity.request.checkResultRequest;
import java.util.List;
import java.util.Map;
/**
@ -29,9 +26,18 @@ public interface BPlanEnterpriseService extends IService<BPlanEnterprise> {
/**
* 执法结果-企业详情
*
* @param req 请求类
* @return
*/
Map<String,Object> getZhifa(checkResultRequest req);
Map<String, Object> getZhifa(checkResultRequest req);
/**
* 查询所有数据
*
* @return
*/
List<BPlanEnterprise> page();
}

7
ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/BPlanManageService.java
Unescape View File

@ -5,6 +5,7 @@ import com.ruoyi.programManagement.entity.BPlanManage;
import com.ruoyi.programManagement.entity.request.checkResultRequest;
import com.ruoyi.programManagement.entity.response.BPlanManageResponse;
import java.util.List;
import java.util.Map;
/**
@ -34,5 +35,11 @@ public interface BPlanManageService extends IService<BPlanManage> {
public Map<String, Object> page(checkResultRequest req);
/**
* 查询计划管理列表
* @param bPlanManage 实体类
* @return
*/
List<BPlanManage> selectBybPlanManage(BPlanManage bPlanManage);
}

20
ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BKeyEnterpriseServiceImpl.java
Unescape View File

@ -1,15 +1,12 @@
package com.ruoyi.programManagement.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.ruoyi.programManagement.entity.BKeyEnterprise;
import com.ruoyi.programManagement.entity.SzEntBasicInfo;
import com.ruoyi.programManagement.entity.request.BKeyEnterprisePageRequest;
import com.ruoyi.programManagement.mapper.BKeyEnterpriseMapper;
import com.ruoyi.programManagement.service.BKeyEnterpriseService;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@ -42,14 +39,19 @@ public class BKeyEnterpriseServiceImpl extends ServiceImpl<BKeyEnterpriseMapper,
}
@Override
public Map<String, Object> page( BKeyEnterprisePageRequest req) {
public Map<String, Object> page(BKeyEnterprisePageRequest req) {
PageHelper.startPage(req.getPageNum(), req.getPageSize());
List<BKeyEnterprise> szEntBasicInfos = bKeyEnterpriseMapper.page(req);
PageHelper.startPage(req.getPageNum(),req.getPageSize());
PageInfo<BKeyEnterprise> pageInfo = new PageInfo<>(szEntBasicInfos);
Map<String, Object> result =new HashMap<>();
result.put("total",pageInfo.getTotal());
result.put("list",pageInfo.getList());
return result;
Map<String, Object> result = new HashMap<>();
result.put("total", pageInfo.getTotal());
result.put("list", pageInfo.getList());
return result;
}
@Override
public BKeyEnterprise getByentCode(String entCode) {
return bKeyEnterpriseMapper.getByentCode(entCode);
}

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

@ -28,13 +28,13 @@ public class BPlanEnterpriseServiceImpl extends ServiceImpl<BPlanEnterpriseMappe
@Override
public void deleteByPlanId(Long planId) {
bPlanEnterpriseMapper.getByPlanId(planId);
bPlanEnterpriseMapper.deleteByPlanId(planId);
}
@Override
public Map<String, Object> getZhifa(checkResultRequest req) {
List<BPlanEnterpriseZhifaResponse> getZhifa = bPlanEnterpriseMapper.getZhifa(req);
PageHelper.startPage(req.getPageNum(), req.getPageSize());
List<BPlanEnterpriseZhifaResponse> getZhifa = bPlanEnterpriseMapper.getZhifa(req);
PageInfo<BPlanEnterpriseZhifaResponse> pageInfo = new PageInfo<>(getZhifa);
Map<String, Object> result = new HashMap<>();
result.put("total", pageInfo.getTotal());
@ -42,6 +42,11 @@ public class BPlanEnterpriseServiceImpl extends ServiceImpl<BPlanEnterpriseMappe
return result;
}
@Override
public List<BPlanEnterprise> page() {
return bPlanEnterpriseMapper.page();
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/programManagement/service/impl/BPlanManageServiceImpl.java
Unescape View File

@ -54,6 +54,10 @@ public class BPlanManageServiceImpl extends ServiceImpl<BPlanManageMapper, BPlan
return result;
}
@Override
public List<BPlanManage> selectBybPlanManage(BPlanManage bPlanManage) {
return bPlanManageMapper.selectBybPlanManage(bPlanManage);
}
}

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

@ -104,10 +104,12 @@ public class SzEntBasicInfoServiceImpl implements ISzEntBasicInfoService
public Map<String, Object> page(SzEntBasicInfoPageRequest req) {
PageHelper.startPage(req.getPageNum(),req.getPageSize());
List<SzEntBasicInfo> szEntBasicInfos = szEntBasicInfoMapper.page(req);
int count=szEntBasicInfoMapper.countIspoint();
PageInfo<SzEntBasicInfo> pageInfo = new PageInfo<>(szEntBasicInfos);
Map<String, Object> result =new HashMap<>();
result.put("total",pageInfo.getTotal());
result.put("list",pageInfo.getList());
result.put("count",count);
return result;
}

4
ruoyi-system/src/main/resources/mapper/yingji/BKeyEnterpriseMapper.xml
Unescape View File

@ -26,4 +26,8 @@
</if>
</where>
</select>
<select id="getByentCode" resultType="com.ruoyi.programManagement.entity.BKeyEnterprise">
select * from b_key_enterprise where ent_code=#{entCode}
</select>
</mapper>

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

@ -7,7 +7,7 @@
<delete id="deleteByPlanId">
delete
* from b_plan_enterprise where plan_id=
from b_plan_enterprise where plan_id=
#{planId}
</delete>
<select id="getByPlanId" resultType="com.ruoyi.programManagement.entity.SzEntBasicInfo">
@ -40,7 +40,7 @@
CASE
WHEN b.USC_CODE IS NOT NULL THEN
1 ELSE 0
1 ELSE 2
END AS checkStatus
FROM
b_plan_enterprise a
@ -61,6 +61,9 @@
</where>
group by s.enterprise_id
</select>
<select id="page" resultType="com.ruoyi.programManagement.entity.BPlanEnterprise">
select * from b_plan_enterprise
</select>
</mapper>

4
ruoyi-system/src/main/resources/mapper/yingji/BPlanManageMapper.xml
Unescape View File

@ -22,4 +22,8 @@
from b_plan_manage a
where id = #{id}
</select>
<select id="selectBybPlanManage" resultType="com.ruoyi.programManagement.entity.BPlanManage">
select a.*
from b_plan_manage a
</select>
</mapper>

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

@ -215,7 +215,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
s.indus_type_class=#{req.indusTypeClass}
</if>
</where>
group by s.USC_CODE
order by is_point desc
</select>
<select id="countIspoint" resultType="java.lang.Integer">
SELECT count(*) as count
FROM (
SELECT
a.*,
CASE WHEN b.ent_code IS NOT NULL THEN 1 ELSE 0 END AS is_point
FROM
sz_ent_basic_info a
LEFT JOIN
b_key_enterprise b ON a.USC_CODE = b.ent_code
) AS s
WHERE s.is_point = 1
</select>
<insert id="insertSzEntBasicInfo" parameterType="SzEntBasicInfo">

Write Preview
Loading…
Cancel
Save