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

Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java into zhangtao

Browse Source
zhangtao
laozt 1 year ago
parent 21184a93e8 7b3ad4852a
commit 2264d3212d
9 changed files with 154 additions and 75 deletions
Show Stats Download Patch File Download Diff File

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

@ -223,5 +223,15 @@ public class BPlanEnterpriseController extends BaseController {
return AjaxResult.success(bPlanEnterpriseService.getPlanMx(req));
}
/**
* 批量更新状态
*/
@ApiOperation(value = "查看计划明细")
@PostMapping("/updateIdList")
public AjaxResult updateIdList(String[] idList) {
bPlanEnterpriseService.updateIdList(idList);
return AjaxResult.success();
}
}

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

@ -176,7 +176,7 @@ public class BPlanEnterprise implements Serializable {
* 0：草稿 1：正式
*/
@ApiModelProperty(value = "0：草稿 1：正式")
private Integer status =0;
private Integer status ;
/**

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

@ -18,24 +18,18 @@ public class checkResultRequest {
/**
* 行政区划
* 计划月份
*/
@ApiModelProperty(value = "行政区划")
private String district;
@ApiModelProperty(value = "计划月份")
private String[] plannedMonth;
/**
* 检查状态
* 行政区划
*/
@ApiModelProperty(value = "检查状态 1=已检查，2=未检查")
private Integer checkStatus;
@ApiModelProperty(value = "行政区划")
private String district;
/**
* 企业名称
*/
@ApiModelProperty(value = "企业名称")
private String enterpriseName;
}

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

@ -1,6 +1,7 @@
package com.ruoyi.programManagement.entity.response;
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;
@ -18,29 +19,14 @@ public class BPlanEnterpriseZhifaResponse {
/**
* 编号
*/
@ApiModelProperty(value = "编号")
@Excel(name = "编号")
@TableId(type = IdType.AUTO)
private Long id;
/**
* 检查表id
*/
@ApiModelProperty(value = "检查表id")
private String longId;
/**
* 计划id
*/
@ApiModelProperty(value = "计划id")
private Long planId;
/**
* 企业id
*/
@ApiModelProperty(value = "企业id")
private String enterpriseId;
@ -48,7 +34,7 @@ public class BPlanEnterpriseZhifaResponse {
* 创建者ID
*/
@ApiModelProperty(value = "创建者ID")
private Integer createId;
private Long createId;
/**
* 创建者
@ -59,9 +45,9 @@ public class BPlanEnterpriseZhifaResponse {
/**
* 创建时间
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "年份", dateFormat = "yyyy-MM-dd")
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd ", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ -69,7 +55,7 @@ public class BPlanEnterpriseZhifaResponse {
* 更新者ID
*/
@ApiModelProperty(value = "更新者ID")
private Integer updateId;
private Long updateId;
/**
* 更新者
@ -105,35 +91,102 @@ public class BPlanEnterpriseZhifaResponse {
/**
* 行政区划
*/
@ApiModelProperty(value = "行政区划")
@Excel(name = "行政区划")
private String district;
/**
* 企业名称
* 计划年份
*/
@ApiModelProperty(value = "计划年份")
@Excel(name = "计划年份")
private String plannedYear;
@ApiModelProperty(value = "企业名称")
/**
* 是否重点企业1：是2：否
*/
@ApiModelProperty(value = "是否重点企业1：是2：否")
private Integer isPoint;
/**
* 企业主表名称
*/
@TableField(exist = false)
@ApiModelProperty(value = "企业主表名称")
private String entprName;
/**
* 企业名称
*/
@Excel(name = "企业名称")
@ApiModelProperty(value = "企业名称")
private String enterpriseName;
/**
* 计划年份
* 执法排序
*/
@ApiModelProperty(value = "执法排序")
private Long lawSort;
@ApiModelProperty(value = "计划年份")
@Excel(name = "计划年份")
private String plannedYear;
/**
* 检查状态
* 执法地区
*/
@ApiModelProperty(value = "执法地区")
private String lawAreas;
/**
* 执法级别
*/
@ApiModelProperty(value = "执法级别")
private String lawLevel;
/**
* 执法层级
*/
@ApiModelProperty(value = "执法层级")
private String lawHierarchy;
/**
* 计划月份
*/
@ApiModelProperty(value = "计划月份")
private String plannedMonth;
/**
* 0：草稿 1：正式
*/
@ApiModelProperty(value = "0：草稿 1：正式")
private Integer status =0;
@ApiModelProperty(value = "检查状态 1=已检查，2=未检查")
@Excel(name = "检查状态",readConverterExp = "1=已检查,2=未检查")
private String checkStatus;
/**
* 0：未检查 1：已检查
*/
@ApiModelProperty(value = "0：未检查 1：已检查")
private Integer checkStatus;
/**
* 检查id
*/
@ApiModelProperty(value = "检查id")
private Integer checkId;
/**
* 1当月 2提前 3滞后
*/
@ApiModelProperty(value = "1当月 2提前 3滞后")
private Integer checkAgeing;
}

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

@ -24,7 +24,11 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterprise> {
*/
void deleteByPlanId(@Param("planId") Long planId);
/**
* 执法
* @param req
* @return
*/
List<BPlanEnterpriseZhifaResponse> getZhifa(@Param("req") checkResultRequest req);
@ -94,5 +98,13 @@ public interface BPlanEnterpriseMapper extends BaseMapper<BPlanEnterprise> {
*/
List<BPlanEnterPriseTreeResponse>getShouYeMxList(@Param("req") BPlanEnterprisePageRequest req);
/**
* 批量更新状态
* @param idList
*/
void updateIdList(String[] idList);
}

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

@ -93,5 +93,12 @@ public interface BPlanEnterpriseService extends IService<BPlanEnterprise> {
*/
List<BPlanEnterPriseTreeResponse> getShouyeList(BPlanEnterprisePageRequest req);
/**
* 批量更新状态
* @param idList
*/
void updateIdList(String[] idList);
}

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

@ -104,6 +104,11 @@ public class BPlanEnterpriseServiceImpl extends ServiceImpl<BPlanEnterpriseMappe
return list;
}
@Override
public void updateIdList(String[] idList) {
bPlanEnterpriseMapper.updateIdList(idList);
}
}

9
ruoyi-admin/src/main/resources/application-druid.yml
Unescape View File

@ -6,16 +6,23 @@ spring:
druid:
# 主库数据源
master:
#本地
#远程
# url: jdbc:mysql://39.101.188.84:3307/ying_ji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: Admin123@
#本地
url: jdbc:mysql://localhost:3306/ying_ji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: adminadmin
# url: jdbc:mysql://192.167.2.56:3306/ying_ji?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC
# username: root
# password: Jichuang@2023
#公司本地
# url: jdbc:mysql://localhost:3307/ying_ji?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: root
# password: Admin123@
# 从库数据源
slave:
# 从数据源开关/默认关闭

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

@ -33,6 +33,7 @@
from b_plan_enterprise
</sql>
<select id="selectBPlanEnterpriseList" parameterType="BPlanEnterprise" resultType="BPlanEnterprise">
select a.id,
a. enterprise_id,
@ -87,40 +88,20 @@
<select id="getZhifa" resultType="com.ruoyi.programManagement.entity.response.BPlanEnterpriseZhifaResponse">
SELECT s.*
FROM (
SELECT
a.*,
a.planned_year AS plannedYear,
b.id AS longId,
b.EXAMINE_START_TIME,
b.EXAMINE_END_TIME,
a.enterprise_name as enterpriseName,
CASE
WHEN b.USC_CODE IS NOT NULL AND SUBSTRING(a.planned_year, 1, 7) = SUBSTRING(b.EXAMINE_START_TIME, 1, 7) THEN 1
ELSE 2
END AS checkStatus,
ROW_NUMBER() OVER (PARTITION BY a.enterprise_id ORDER BY b.EXAMINE_START_TIME DESC) AS rn
FROM
b_plan_enterprise a
LEFT JOIN sz_enfor_examine b ON a.enterprise_id = b.USC_CODE AND b.USC_CODE IS NOT NULL
) s
select * from b_plan_enterprise
<where>
<if test="req.plannedYear !=null and req.plannedYear !=''">
and s.plannedYear =#{req.plannedYear}
and planned_year =#{req.plannedYear}
</if>
<if test="req.district !=null and req.district !=''">
and s.district like concat('%', #{req.district}, '%')
</if>
<if test="req.checkStatus !=null and req.checkStatus !=''">
and s.checkStatus =#{req.checkStatus}
and district like concat('%', #{req.district}, '%')
</if>
<if test="req.enterpriseName !=null and req.enterpriseName !=''">
and s.enterpriseName like concat('%', #{req.enterpriseName}, '%')
<if test="req.plannedMonth != null and req.plannedMonth.length > 0">
AND planned_month IN
<foreach item="item" collection="req.plannedMonth" open="(" separator="," close=")">
#{item}
</foreach>
</if>
and s.rn = 1
</where>
</select>
<select id="page" resultType="com.ruoyi.programManagement.entity.BPlanEnterprise">
@ -270,5 +251,15 @@
</select>
<update id="updateIdList">
UPDATE b_plan_enterprise
SET status = 1
WHERE id in
<foreach item="item" collection="idList" open="(" separator="," close=")">
#{item}
</foreach>
</update>
</mapper>
Write Preview
Loading…
Cancel
Save