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

重点企业和计划表字段新增

Browse Source
zhangtao
dongdingding 11 months ago
parent 38fa0ab407
commit 47a6aacc65
8 changed files with 131 additions and 92 deletions
Show Stats Download Patch File Download Diff File

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

@ -109,17 +109,17 @@ public class BKeyEnterpriseController extends BaseController {
return AjaxResult.success();
}
/**
* 根据行政区划代码查询重点企业数量
*
* @param district 行政区划代码
* @return 结果集合
*/
@GetMapping("/getBydistrict")
@ApiOperation(value = "根据行政区划代码查询重点企业数量")
public AjaxResult getBydistrict(@RequestParam("district") String district) {
return success(bKeyEnterpriseService.getBydistrict(district));
}
//
// /**
// * 根据行政区划代码查询重点企业数量
// *
// * @param district 行政区划代码
// * @return 结果集合
// */
// @GetMapping("/getBydistrict")
// @ApiOperation(value = "根据行政区划代码查询重点企业数量")
// public AjaxResult getBydistrict(@RequestParam("district") String district) {
// return success(bKeyEnterpriseService.getBydistrict(district));
// }
}

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

@ -110,12 +110,6 @@ public class BKeyEnterprise implements Serializable {
@Excel(name = "企业名称")
private String enterpriseName;
/**
* 行政区划
*/
@ApiModelProperty(value = "行政区划")
@Excel(name = "行政区划")
private String district;
}

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

@ -135,7 +135,7 @@ public class BPlanEnterprise implements Serializable {
private Integer isPoint;
/**
*企业主表名称
* 企业主表名称
*/
@TableField(exist = false)
@ApiModelProperty(value = "企业主表名称")
@ -149,5 +149,68 @@ public class BPlanEnterprise implements Serializable {
@ApiModelProperty(value = "企业名称")
private String enterpriseName;
/**
* 执法排序
*/
@ApiModelProperty(value = "执法排序")
private Long lawSort;
/**
* 执法地区
*/
@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：未检查 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;
}

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

@ -46,14 +46,14 @@ public interface BKeyEnterpriseMapper extends BaseMapper<BKeyEnterprise> {
/**
* 根据行政区划代码查询重点企业数量
*
* @param district 行政区划代码
* @return 结果集合
*/
Integer getBydistrict(String district);
// /**
// * 根据行政区划代码查询重点企业数量
// *
// * @param district 行政区划代码
// * @return 结果集合
// */
//
// Integer getBydistrict(String district);
}

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

@ -38,14 +38,14 @@ public interface BKeyEnterpriseService extends IService<BKeyEnterprise> {
BKeyEnterprise getByentCode(String entCode);
/**
* 根据行政区划代码查询重点企业数量
*
* @param district 行政区划代码
* @return 结果集合
*/
Integer getBydistrict(String district);
//
// /**
// * 根据行政区划代码查询重点企业数量
// *
// * @param district 行政区划代码
// * @return 结果集合
// */
//
// Integer getBydistrict(String district);
}

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

@ -34,11 +34,6 @@ public class BKeyEnterpriseServiceImpl extends ServiceImpl<BKeyEnterpriseMapper,
StringBuilder successMsg = new StringBuilder();
if (!bKeyEnterpriseList.isEmpty()) {
for (BKeyEnterprise bKeyEnterprise : bKeyEnterpriseList) {
//根据entcode获取行政区划代码
String entCode = bKeyEnterprise.getEntCode();
if (entCode!=null){
bKeyEnterprise.setDistrict(iSzEntBasicInfoService.getDistrict(entCode));
}
baseMapper.bKeyEnterpriseAdd(bKeyEnterprise);
}
successMsg.append("导入成功");
@ -62,11 +57,11 @@ public class BKeyEnterpriseServiceImpl extends ServiceImpl<BKeyEnterpriseMapper,
public BKeyEnterprise getByentCode(String entCode) {
return bKeyEnterpriseMapper.getByentCode(entCode);
}
@Override
public Integer getBydistrict(String district) {
return bKeyEnterpriseMapper.getBydistrict(district);
}
//
// @Override
// public Integer getBydistrict(String district) {
// return bKeyEnterpriseMapper.getBydistrict(district);
// }
}

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

@ -11,13 +11,13 @@
<if test="entCode != null">ent_code,</if>
<if test="year != null">year,</if>
<if test="enterpriseName != null">enterprise_name,</if>
<if test="district!= null">district,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="entCode != null">#{entCode},</if>
<if test="year != null">#{year},</if>
<if test="enterpriseName != null">#{enterpriseName},</if>
<if test="district != null">#{district},</if>
</trim>
</insert>

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

@ -4,25 +4,25 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.programManagement.mapper.BPlanEnterpriseMapper">
<resultMap type="BPlanEnterprise" id="BPlanEnterpriseResult">
<result property="id" column="id"/>
<result property="enterpriseId" column="enterprise_id"/>
<result property="createId" column="create_id"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
<result property="updateId" column="update_id"/>
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
<result property="userId" column="user_id"/>
<result property="deptId" column="dept_id"/>
<result property="district" column="district"/>
<result property="plannedYear" column="planned_year"/>
<result property="planName" column="plan_name"/>
<result property="planContent" column="plan_content"/>
<result property="isPoint" column="is_point"/>
<result property="enterpriseName" column="enterprise_name"/>
</resultMap>
<!-- <resultMap type="BPlanEnterprise" id="BPlanEnterpriseResult">-->
<!-- <result property="id" column="id"/>-->
<!-- <result property="enterpriseId" column="enterprise_id"/>-->
<!-- <result property="createId" column="create_id"/>-->
<!-- <result property="createBy" column="create_by"/>-->
<!-- <result property="createTime" column="create_time"/>-->
<!-- <result property="updateId" column="update_id"/>-->
<!-- <result property="updateBy" column="update_by"/>-->
<!-- <result property="updateTime" column="update_time"/>-->
<!-- <result property="remark" column="remark"/>-->
<!-- <result property="userId" column="user_id"/>-->
<!-- <result property="deptId" column="dept_id"/>-->
<!-- <result property="district" column="district"/>-->
<!-- <result property="plannedYear" column="planned_year"/>-->
<!-- <result property="planName" column="plan_name"/>-->
<!-- <result property="planContent" column="plan_content"/>-->
<!-- <result property="isPoint" column="is_point"/>-->
<!-- <result property="enterpriseName" column="enterprise_name"/>-->
<!-- </resultMap>-->
<sql id="selectBPlanEnterpriseVo">
select id,
enterprise_id,
@ -40,11 +40,20 @@
plan_name,
plan_content,
is_point,
enterprise_name
enterprise_name,
law_sort,
law_areas,
law_level,
law_hierarchy,
planned_month,
status,
check_status,
check_id,
check_ageing
from b_plan_enterprise
</sql>
<select id="selectBPlanEnterpriseList" parameterType="BPlanEnterprise" resultMap="BPlanEnterpriseResult">
<select id="selectBPlanEnterpriseList" parameterType="BPlanEnterprise" resultType="BPlanEnterprise">
<include refid="selectBPlanEnterpriseVo"/>
<where>
<if test="enterpriseId != null and enterpriseId != ''">and enterprise_id = #{enterpriseId}</if>
@ -68,29 +77,7 @@
</delete>
<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,
-- b.ENTPR_NAME as entprName,
-- 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
-- FROM
-- b_plan_enterprise a
-- LEFT JOIN sz_enfor_examine b ON a.enterprise_id = b.USC_CODE
-- WHERE
-- b.USC_CODE IS NOT NULL
-- ) s
SELECT s.*
FROM (
SELECT

Write Preview
Loading…
Cancel
Save