chenrui
/
zdxtLawEnforcementCode
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

同比环比

v6
蟑螂恶霸 1 year ago
parent
b1947eb163
commit
3d387180ea
5 changed files with 82 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
  2. 12
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
  3. 2
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
  4. 44
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
  5. 15
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

30
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html
View File

@ -45,12 +45,20 @@
<p>检查事项：</p>
<input type="text" name="lawEnforcementItemText"/>
</li>
<!-- <li>-->
<!-- <p>联合检查：</p>-->
<!-- <select id="uniteCheck" name="uniteCheck" onchange="">-->
<!-- <option value="">所有</option>-->
<!-- <option value="1">否</option>-->
<!-- <option value="0">是</option>-->
<!-- </select>-->
<!-- </li>-->
<li>
<p>联合检查：</p>
<select id="uniteCheck" name="uniteCheck" onchange="">
<p>是否受委托：</p>
<select id="hasAuto" name="hasAuto" onchange="">
<option value="">所有</option>
<option value="1">否</option>
<option value="0">是</option>
<option value="0">否</option>
<option value="1">是</option>
</select>
</li>
<li>
@ -327,7 +335,7 @@
columns: [
{
field : 'enterpriseName',
title : '被检查企业名称',
title : '被检查企业名称1',
formatter:function (value) {
return "<div style='text-align: left'>"+ value +"</div>";
}
@ -391,6 +399,18 @@
}
}
},
{
field : 'uniteCheck',
title : '受委托',
formatter:function (value,row,index) {
if(value == 1){
/*return "<span>是</span>";*/
return '<span>'+'是'+'</span>';
}else{
return "<span>否</span>";
}
}
},
{
field : 'checkCategory',
title : '行政检查类别',

12
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java
View File

@ -155,9 +155,9 @@ public class EnforcementRegistration extends BaseDomain
/** 联合检查编号(用于) */
private String unionNo;
/** 是否联合检查 */
private int hasUnion;
private Integer hasUnion;
/** 是否委托查询 */
private int hasAuto;
private Integer hasAuto;
/**
* 关键字查询
@ -428,19 +428,19 @@ public class EnforcementRegistration extends BaseDomain
this.enterpriseNumber = enterpriseNumber;
}
public int getHasUnion() {
public Integer getHasUnion() {
return hasUnion;
}
public void setHasUnion(int hasUnion) {
public void setHasUnion(Integer hasUnion) {
this.hasUnion = hasUnion;
}
public int getHasAuto() {
public Integer getHasAuto() {
return hasAuto;
}
public void setHasAuto(int hasAuto) {
public void setHasAuto(Integer hasAuto) {
this.hasAuto = hasAuto;
}

2
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
View File

@ -335,6 +335,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
enforcementRegistration.setHasUnion(0); // 新开的联合检查先设置为0, 以为不确定后面来的人会不会与其关联, 如果都不关联, 只有它一条数据, 则不算联合检查
String unionNo = IdUtil.simpleUUID();
enforcementRegistration.setUnionNo(unionNo);
enforcementRegistration.setUniteCheck("1"); // 为了适应来代码中的联合执法编码
enforcementRegistration.setCheckCss(unionNo); // 为了适应来代码中的联合执法编码
}
// 新增检查登记
@ -345,6 +346,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
EnforcementRegistration updateUnionParams = new EnforcementRegistration();
updateUnionParams.setUnionNo(enforcementRegistration.getUnionNo());
updateUnionParams.setHasUnion(1);
enforcementRegistration.setUniteCheck("0"); // 为了适应来代码中的联合执法编码
enforcementRegistrationMapper.updateRegToUnionFlag(updateUnionParams);
}

44
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/StatisticalPaneServiceImpl.java
View File

@ -692,8 +692,10 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
double reg_rr_num = statisticalPanelMapper.staisticalRegistration_rr(params);
double reg_yoy_num = statisticalPanelMapper.staisticalRegistration_yoy(params);
registration.setNum(reg_num);
registration.setRing_ratio(this.calculateRingRatio(reg_rr_num, reg_num));
registration.setYoy(this.calculateYearOverYear(reg_yoy_num, reg_num));
// registration.setRing_ratio(this.calculateRingRatio(reg_rr_num, reg_num));
// registration.setYoy(this.calculateYearOverYear(reg_yoy_num, reg_num));
registration.setRing_ratio(this.setPercentage((reg_num - reg_rr_num) / reg_rr_num));
registration.setYoy(this.setPercentage((reg_num - reg_yoy_num) / reg_yoy_num));
// 联合检查数量
SixAnalysis unite_registration = new SixAnalysis();
all_area.add(unite_registration);
@ -703,8 +705,10 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
double unite_reg_rr_num = statisticalPanelMapper.staisticalRegistration_rr(params);
double unite_reg_yoy_num = statisticalPanelMapper.staisticalRegistration_yoy(params);
unite_registration.setNum(unite_reg_num);
unite_registration.setRing_ratio(this.calculateRingRatio(unite_reg_rr_num, unite_reg_num));
unite_registration.setYoy(this.calculateYearOverYear(unite_reg_yoy_num, unite_reg_num));
// unite_registration.setRing_ratio(this.calculateRingRatio(unite_reg_rr_num, unite_reg_num));
// unite_registration.setYoy(this.calculateYearOverYear(unite_reg_yoy_num, unite_reg_num));
unite_registration.setRing_ratio(this.setPercentage((unite_reg_num - unite_reg_rr_num) / unite_reg_rr_num));
unite_registration.setYoy(this.setPercentage((unite_reg_num - unite_reg_yoy_num) / unite_reg_yoy_num));
params.setUniteCheck(null);
// 行政检查预告数量
SixAnalysis lawEnforcement = new SixAnalysis();
@ -714,8 +718,10 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
double law_rr_num = statisticalPanelMapper.staisticalLawEnforcement_rr(params);
double law_yoy_num = statisticalPanelMapper.staisticalLawEnforcement_yoy(params);
lawEnforcement.setNum(law_num);
lawEnforcement.setRing_ratio(this.calculateRingRatio(law_rr_num, law_num));
lawEnforcement.setYoy(this.calculateYearOverYear(law_yoy_num, law_num));
// lawEnforcement.setRing_ratio(this.calculateRingRatio(law_rr_num, law_num));
// lawEnforcement.setYoy(this.calculateYearOverYear(law_yoy_num, law_num));
lawEnforcement.setRing_ratio(this.setPercentage((law_num - law_rr_num) / law_rr_num));
lawEnforcement.setYoy(this.setPercentage((law_num - law_yoy_num) / law_yoy_num));
//涉企投诉数量
SixAnalysis complaint = new SixAnalysis();
all_area.add(complaint);
@ -724,8 +730,10 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
double com_rr_num = statisticalPanelMapper.staisticalComplaint_rr(params);
double com_yoy_num = statisticalPanelMapper.staisticalComplaint_yoy(params);
complaint.setNum(com_num);
complaint.setRing_ratio(this.calculateRingRatio(com_rr_num, com_num));
complaint.setYoy(this.calculateYearOverYear(com_yoy_num, com_num));
// complaint.setRing_ratio(this.calculateRingRatio(com_rr_num, com_num));
// complaint.setYoy(this.calculateYearOverYear(com_yoy_num, com_num));
complaint.setRing_ratio(this.setPercentage((com_num - com_rr_num) / com_rr_num));
complaint.setYoy(this.setPercentage((com_num - com_yoy_num) / com_yoy_num));
//执法预警数量
// SixAnalysis warning = new SixAnalysis();
// all_area.add(warning);
@ -746,8 +754,10 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
double ent_yoy_num = statisticalPanelMapper.staisticalEnterprise_yoy(params);
params.setQy(null);
enterprise.setNum(ent_num);
enterprise.setRing_ratio(this.calculateRingRatio(ent_rr_num, ent_num));
enterprise.setYoy(this.calculateYearOverYear(ent_yoy_num, ent_num));
// enterprise.setRing_ratio(this.calculateRingRatio(ent_rr_num, ent_num));
// enterprise.setYoy(this.calculateYearOverYear(ent_yoy_num, ent_num));
enterprise.setRing_ratio(this.setPercentage((ent_num - ent_rr_num) / ent_rr_num));
enterprise.setYoy(this.setPercentage((ent_num - ent_yoy_num) / ent_yoy_num));
params.setDateType("day");
@ -1173,4 +1183,18 @@ public class StatisticalPaneServiceImpl implements StatisticalPaneService {
return decimalFormat.format(yearOverYear);
}
private String setPercentage(Double percentage) {
if (percentage == 0 || percentage.isNaN() || percentage.isInfinite()) {
return "0.0";
} else {
String s = percentage * 100 + "";
if (s.length() > s.indexOf(".") + 3) {
percentage = Double.valueOf(s.substring(0, s.indexOf(".") + 3));
} else {
percentage = Double.valueOf(s);
}
return Double.valueOf(String.format("%.2f", percentage)).toString();
}
}
}

15
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
View File

@ -173,6 +173,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="enterpriseNumber != null and enterpriseNumber != ''"> and enterprise_number = #{enterpriseNumber}</if>
<if test="isDelete != null "> and is_delete = #{isDelete}</if>
<if test="status != null "> and status = #{status}</if>
<if test="unionNo != null and unionNo != ''"> and union_no = #{unionNo}</if>
<if test="hasUnion != null and hasUnion != ''"> and has_union = #{hasUnion}</if>
<if test="hasAuto != null and hasAuto != ''"> and has_auto = #{hasAuto}</if>
<!-- <if test="searchValue != null and searchValue != ''">-->
<!-- and (law_enforcement_item_text like concat(concat('%',#{searchValue}),'%')-->
@ -251,6 +254,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deptId != null "> and dept_id = #{deptId}</if>
<if test="isDelete != null "> and is_delete = #{isDelete}</if>
<if test="status != null "> and status = #{status}</if>
<if test="unionNo != null and unionNo != ''"> and union_no = #{unionNo}</if>
<if test="hasUnion != null and hasUnion != ''"> and has_union = #{hasUnion}</if>
<if test="hasAuto != null and hasAuto != ''"> and has_auto = #{hasAuto}</if>
<if test="searchValue != null and searchValue != ''">
and ( enterprise_name like concat('%',#{searchValue},'%'))</if>
<if test="dateSearch != null and dateSearch != ''">
@ -339,6 +345,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="lawEnforcementCode != null and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
<if test="uniteCheck == '0'.toString()"> and unite_check is not null</if>
<if test="uniteCheck == '1'.toString()"> and unite_check is null</if>
<if test="unionNo != null and unionNo != ''"> and union_no = #{unionNo}</if>
<if test="hasUnion != null and hasUnion != ''"> and has_union = #{hasUnion}</if>
<if test="hasAuto != null and hasAuto != ''"> and has_auto = #{hasAuto}</if>
<if test="enforce == '0'.toString()"> and check_css is not null</if>
<if test="enforce == '1'.toString()"> and check_css is null</if>
<if test="checkCategory != null and checkCategory != ''"> and check_category = #{checkCategory}</if>
@ -402,6 +411,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="uniteCheck == '1'.toString()"> and r.unite_check is null</if>
<if test="enforce == '0'.toString()"> and r.check_css is null</if>
<if test="enforce == '1'.toString()"> and r.check_css is not null</if>
<if test="unionNo != null and unionNo != ''"> and union_no = #{unionNo}</if>
<if test="hasUnion != null and hasUnion != ''"> and has_union = #{hasUnion}</if>
<if test="hasAuto != null and hasAuto != ''"> and has_auto = #{hasAuto}</if>
<if test="checkCategory != null and checkCategory != ''"> and r.check_category = #{checkCategory}</if>
<if test="checkCss != null and checkCss != ''"> and r.check_css = #{checkCss}</if>
<if test="lawEnforcementItemText != null and lawEnforcementItemText != ''"> and law_enforcement_item_text like concat('%', #{lawEnforcementItemText,jdbcType=VARCHAR}, '%')</if>
@ -464,6 +476,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isDelete != null "> and is_delete = #{isDelete}</if>
<if test="isComplaint != null "> and is_complaint = #{isComplaint}</if>
<if test="status != null "> and status = #{status}</if>
<if test="unionNo != null and unionNo != ''"> and union_no = #{unionNo}</if>
<if test="hasUnion != null and hasUnion != ''"> and has_union = #{hasUnion}</if>
<if test="hasAuto != null and hasAuto != ''"> and has_auto = #{hasAuto}</if>
<if test="lawEnforcementCode != null and lawEnforcementCode != ''"> and law_enforcement_code = #{lawEnforcementCode}</if>
@ -1047,6 +1060,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="uniteCheck != null and uniteCheck != ''">
and r.unite_check=#{uniteCheck}
</if>
<if test="unionNo != null and unionNo != ''"> and union_no = #{unionNo}</if>
<if test="id != null and id != ''">
and r.id !=#{id}
</if>
@ -1061,6 +1075,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="uniteCheck != null and uniteCheck != ''">
and r.unite_check=#{uniteCheck}
</if>
<if test="unionNo != null and unionNo != ''"> and union_no = #{unionNo}</if>
<if test="id != null and id != ''">
and r.id !=#{id}
</if>

Write Preview
Loading…
Cancel
Save