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

全部提交先

v5
蟑螂恶霸 3 months ago
parent
2a2bd24e45
commit
3334020e20
12 changed files with 62 additions and 48 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. 4
      lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java
  2. 2
      lib/EmergencyBaseLib/pom.xml
  3. 2
      lib/EmergencyService/pom.xml
  4. 2
      lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/controller/LoginByUserIdController.java
  5. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/jump.html
  6. 2
      lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html
  7. 79
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java
  8. 5
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
  9. 3
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java
  10. 4
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
  11. 3
      lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml
  12. 2
      lib/ZdxtComponent/pom.xml

4
lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java
View File

@ -32,11 +32,11 @@ public class IdCardCryptoUtil {
String key = "VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0";
System.out.println("====================== 示例 ======================");
// 加密
String source_dec = "15118142870";
String source_dec = "19166279367";
String enc = IdCardCryptoUtil.symmetricEncryptIdCard(key, source_dec);
System.out.println(source_dec+" 加密后 : "+enc);
// 解密
String source_enc = "wDLyWcBO/fIH2rJpSGN98A==";
String source_enc = "+ENESlbUbgdIOLpFtZxI7Q==";
String dec = IdCardCryptoUtil.symmetricDecryptIdCard(key, source_enc);
System.out.println(source_enc+" 解密后 : "+dec);

2
lib/EmergencyBaseLib/pom.xml
View File

@ -32,7 +32,7 @@
<swagger.version>3.0.0</swagger.version>
<mybatis-spring-boot.version>2.1.4</mybatis-spring-boot.version>
<pagehelper.boot.version>1.3.1</pagehelper.boot.version>
<fastjson.version>1.2.76</fastjson.version>
<fastjson.version>2.0.61</fastjson.version>
<oshi.version>5.8.0</oshi.version>
<jna.version>5.8.0</jna.version>
<commons.io.version>2.11.0</commons.io.version>

2
lib/EmergencyService/pom.xml
View File

@ -35,7 +35,7 @@
<thymeleaf.extras.shiro.version>2.1.0</thymeleaf.extras.shiro.version>
<mybatis.spring.boot.starter.version>1.3.2</mybatis.spring.boot.starter.version>
<pagehelper.spring.boot.starter.version>1.2.5</pagehelper.spring.boot.starter.version>
<fastjson.version>1.2.70</fastjson.version>
<fastjson.version>2.0.61</fastjson.version>
<druid.version>1.1.14</druid.version>
<commons.io.version>2.5</commons.io.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>

2
lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/controller/LoginByUserIdController.java
View File

@ -54,7 +54,7 @@ public class LoginByUserIdController extends BaseController {
/**
* 允许登录的结束日期时间（格式 yyyy-MM-dd HH:mm）
*/
private static final String ALLOWED_END_TIME = "2026-08-01 22:00";
private static final String ALLOWED_END_TIME = "2026-09-01 22:00";
@Autowired
private IUserService userService;

2
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/jump.html
View File

@ -24,7 +24,7 @@
(function(){
var now = new Date();
var start = new Date('2026-06-19');
var end = new Date('2026-08-01');
var end = new Date('2026-09-01');
var inAllowedPeriod = (now >= start && now <= end);
if(!inAllowedPeriod && window.top!==window.self){window.top.location=window.location}
})();

2
lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/login.html
View File

@ -206,7 +206,7 @@
(function(){
var now = new Date();
var start = new Date('2026-06-19');
var end = new Date('2026-08-01');
var end = new Date('2026-09-01');
var inAllowedPeriod = (now >= start && now <= end);
if(!inAllowedPeriod && window.top!==window.self){window.top.location=window.location}
})();

79
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementCheckStatisticsImpl.java
View File

@ -9,6 +9,7 @@ import com.zdxt.code.mapper.*;
import com.zdxt.code.service.EnforcementCheckStatisticsService;
import com.zdxt.common.annotation.DataScope;
import com.zdxt.common.util.DateUtils;
import com.zdxt.domain.auth.Dept;
import com.zdxt.domain.auth.DictData;
import com.zdxt.domain.auth.User;
@ -73,7 +74,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
cell.setCellStyle(styleRow3);
}
}
private void setStyle1(int c1,String c2,String c3,String c4,String c5,String c6,String c7,long c8,long c9,long c10,long c11,long c12,String c13,HSSFRow row,HSSFCellStyle styleRow3){
private void setStyle1(int c1,String c2,String c3,String c4,String c5,String c6,String c7,long c8,long c9,long c10,long c11,long c12,EnforcementCheckStatistics record,HSSFRow row,HSSFCellStyle styleRow3){
HSSFCell cell1= row.createCell(0);
cell1.setCellValue(c1);
cell1.setCellStyle(styleRow3);
@ -121,8 +122,13 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
cell12.setCellValue(c12);
}
HSSFCell cell13= row.createCell(12);
cell13.setCellValue(c13);
cell13.setCellValue(record.getRemark() != null ? record.getRemark() : "");
cell13.setCellStyle(styleRow3);
HSSFCell cell14= row.createCell(13);
if(record.getCreateTime() != null) {
cell14.setCellValue(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", record.getCreateTime()));
}
cell14.setCellStyle(styleRow3);
}
/**
*为合并的单元格修正样式
@ -384,13 +390,13 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
//将单元格样式应用到该单元格
cell1.setCellStyle(styleRow1);
//合并单元格--CellRangeAddress(起始行，结束行，起始列，结束列)
sheet.addMergedRegion(new CellRangeAddress(0,0,0,12));
sheet.addMergedRegion(new CellRangeAddress(0,0,0,13));
//在sheet里创建第二行
HSSFRow row2=sheet.createRow(1);
List<String> headRow2List=new ArrayList<>();
Collections.addAll(headRow2List,"序号","区域","企业","执法主体","执法人员","执法事项","执法时间","执法次数",
"2次及以下","3至4次","5至6次","7次及以上","备注");
"2次及以下","3至4次","5至6次","7次及以上","备注","创建时间");
setStyle(headRow2List,row2,styleRow2);
int rowNum=1;
//遍历地区list
@ -421,7 +427,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
//setStyle(cellList,row,styleRow3);
setStyle1(i+1,area,qyGroup2.get(k).get(0).getEnterpriseName(),qyGroup2.get(k).get(0).getBureauDeptName(),
qyGroup2.get(k).get(0).getLawEnforcerTwo(),qyGroup2.get(k).get(0).getLawEnforcementItem(),qyGroup2.get(k).get(0).getEnforcementTime(),1,1,0,0,0,
qyGroup2.get(k).get(0).getRemark(),row,styleRow3);
qyGroup2.get(k).get(0),row,styleRow3);
}else {
sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),2,2));//合并企业
sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),7,7));
@ -449,28 +455,28 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
""+qyGroup1.get(k),"","","",zfGroup2.get(zf).get(0).getRemark());
setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,qyGroup1.get(k),
0,0,0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
0,0,0,zfGroup2.get(zf).get(0),row,styleRow3);
} else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) {
Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
"",""+qyGroup1.get(k),"","",zfGroup2.get(zf).get(0).getRemark());
setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,
0,qyGroup1.get(k),0,0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
0,qyGroup1.get(k),0,0,zfGroup2.get(zf).get(0),row,styleRow3);
} else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) {
Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
"","",""+qyGroup1.get(k),"",zfGroup2.get(zf).get(0).getRemark());
setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,
0,0,qyGroup1.get(k),0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
0,0,qyGroup1.get(k),0,zfGroup2.get(zf).get(0),row,styleRow3);
}else {
Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
"","","",""+qyGroup1.get(k),zfGroup2.get(zf).get(0).getRemark());
setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,
0,0,0,qyGroup1.get(k),zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
0,0,0,qyGroup1.get(k),zfGroup2.get(zf).get(0),row,styleRow3);
}
//setStyle(cellList,row,styleRow3);
}else{
@ -491,28 +497,28 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
""+qyGroup1.get(k),"","","",ryGroup2.get(ry).get(0).getRemark());
setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
qyGroup1.get(k),0,0,0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
qyGroup1.get(k),0,0,0,ryGroup2.get(ry).get(0),row,styleRow3);
} else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) {
Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
"",""+qyGroup1.get(k),"","",ryGroup2.get(ry).get(0).getRemark());
setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
0,qyGroup1.get(k),0,0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
0,qyGroup1.get(k),0,0,ryGroup2.get(ry).get(0),row,styleRow3);
} else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) {
Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
"","",""+qyGroup1.get(k),"",ryGroup2.get(ry).get(0).getRemark());
setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
0,0,qyGroup1.get(k),0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
0,0,qyGroup1.get(k),0,ryGroup2.get(ry).get(0),row,styleRow3);
}else {
Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
"","","",""+qyGroup1.get(k),ryGroup2.get(ry).get(0).getRemark());
setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
0,0,0,qyGroup1.get(k),ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
0,0,0,qyGroup1.get(k),ryGroup2.get(ry).get(0),row,styleRow3);
}
//setStyle(cellList,row,styleRow3);
}else {
@ -532,28 +538,28 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
""+qyGroup1.get(k),"","","",sxGroup2.get(sx).get(0).getRemark());
setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx),
qyGroup1.get(k),0,0,0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
qyGroup1.get(k),0,0,0,sxGroup2.get(sx).get(0),row,styleRow3);
} else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) {
Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
"",""+qyGroup1.get(k),"","",sxGroup2.get(sx).get(0).getRemark());
setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx),
0,qyGroup1.get(k),0,0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
0,qyGroup1.get(k),0,0,sxGroup2.get(sx).get(0),row,styleRow3);
} else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) {
Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
"","",""+qyGroup1.get(k),"",sxGroup2.get(sx).get(0).getRemark());
setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx),
0,0,qyGroup1.get(k),0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
0,0,qyGroup1.get(k),0,sxGroup2.get(sx).get(0),row,styleRow3);
}else {
Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
"","","",""+qyGroup1.get(k),sxGroup2.get(sx).get(0).getRemark());
setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx),
0,0,0,qyGroup1.get(k),sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
0,0,0,qyGroup1.get(k),sxGroup2.get(sx).get(0),row,styleRow3);
}
//setStyle(cellList,row,styleRow3);
if (sxGroup1.get(sx) >= 2) {
@ -576,7 +582,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
rowNum++;
HSSFRow row=sheet.createRow(rowNum);
List<String> cellList=new ArrayList<>();
Collections.addAll(cellList,""+(i+1),area,"","","","","","","","","","","");
Collections.addAll(cellList,""+(i+1),area,"","","","","","","","","","","","");
setStyle(cellList,row,styleRow3);
}
}
@ -2233,6 +2239,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
sheet.setColumnWidth(10,2586);
sheet.setColumnWidth(11,2586);
sheet.setColumnWidth(12,2586);
sheet.setColumnWidth(13,3727);
// sheet.setDefaultColumnWidth(20);//全局
// sheet.setColumnWidth(0,2500);//某列
// sheet.setColumnWidth(1,2500);
@ -2335,13 +2342,13 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
//将单元格样式应用到该单元格
cell1.setCellStyle(styleRow1);
//合并单元格--CellRangeAddress(起始行，结束行，起始列，结束列)
sheet.addMergedRegion(new CellRangeAddress(0,0,0,12));
sheet.addMergedRegion(new CellRangeAddress(0,0,0,13));
//在sheet里创建第二行
HSSFRow row2=sheet.createRow(1);
List<String> headRow2List=new ArrayList<>();
Collections.addAll(headRow2List,"序号","区域","企业","执法主体","执法人员","执法事项","执法时间","执法次数",
"2次及以下","3至4次","5至6次","7次及以上","备注");
"2次及以下","3至4次","5至6次","7次及以上","备注","创建时间");
setStyle(headRow2List,row2,styleRow2);
int rowNum=1;
//遍历地区list
@ -2372,7 +2379,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
//setStyle(cellList,row,styleRow3);
setStyle1(i+1,area,qyGroup2.get(k).get(0).getEnterpriseName(),qyGroup2.get(k).get(0).getBureauDeptName(),
qyGroup2.get(k).get(0).getLawEnforcerTwo(),qyGroup2.get(k).get(0).getLawEnforcementItem(),qyGroup2.get(k).get(0).getEnforcementTime(),1,1,0,0,0,
qyGroup2.get(k).get(0).getRemark(),row,styleRow3);
qyGroup2.get(k).get(0),row,styleRow3);
}else {
sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),2,2));//合并企业
sheet.addMergedRegion(new CellRangeAddress(rowNum+1, (int) (rowNum+qyGroup1.get(k)),8,8));
@ -2400,28 +2407,28 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
""+qyGroup1.get(k),"","","",zfGroup2.get(zf).get(0).getRemark());
setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,qyGroup1.get(k),
0,0,0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
0,0,0,zfGroup2.get(zf).get(0),row,styleRow3);
} else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) {
Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
"",""+qyGroup1.get(k),"","",zfGroup2.get(zf).get(0).getRemark());
setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,
0,qyGroup1.get(k),0,0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
0,qyGroup1.get(k),0,0,zfGroup2.get(zf).get(0),row,styleRow3);
} else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) {
Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
"","",""+qyGroup1.get(k),"",zfGroup2.get(zf).get(0).getRemark());
setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,
0,0,qyGroup1.get(k),0,zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
0,0,qyGroup1.get(k),0,zfGroup2.get(zf).get(0),row,styleRow3);
}else {
Collections.addAll(cellList,""+(i+1),area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),"1",
"","","",""+qyGroup1.get(k),zfGroup2.get(zf).get(0).getRemark());
setStyle1(i+1,area,zfGroup2.get(zf).get(0).getEnterpriseName(),zfGroup2.get(zf).get(0).getBureauDeptName(),
zfGroup2.get(zf).get(0).getLawEnforcerTwo(),zfGroup2.get(zf).get(0).getLawEnforcementItem(),zfGroup2.get(zf).get(0).getEnforcementTime(),1,
0,0,0,qyGroup1.get(k),zfGroup2.get(zf).get(0).getRemark(),row,styleRow3);
0,0,0,qyGroup1.get(k),zfGroup2.get(zf).get(0),row,styleRow3);
}
//setStyle(cellList,row,styleRow3);
}else{
@ -2442,28 +2449,28 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
""+qyGroup1.get(k),"","","",ryGroup2.get(ry).get(0).getRemark());
setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
qyGroup1.get(k),0,0,0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
qyGroup1.get(k),0,0,0,ryGroup2.get(ry).get(0),row,styleRow3);
} else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) {
Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
"",""+qyGroup1.get(k),"","",ryGroup2.get(ry).get(0).getRemark());
setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
0,qyGroup1.get(k),0,0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
0,qyGroup1.get(k),0,0,ryGroup2.get(ry).get(0),row,styleRow3);
} else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) {
Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
"","",""+qyGroup1.get(k),"",ryGroup2.get(ry).get(0).getRemark());
setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
0,0,qyGroup1.get(k),0,ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
0,0,qyGroup1.get(k),0,ryGroup2.get(ry).get(0),row,styleRow3);
}else {
Collections.addAll(cellList,""+(i+1),area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),"1",
"","","",""+qyGroup1.get(k),ryGroup2.get(ry).get(0).getRemark());
setStyle1(i+1,area,ryGroup2.get(ry).get(0).getEnterpriseName(),ryGroup2.get(ry).get(0).getBureauDeptName(),
ryGroup2.get(ry).get(0).getLawEnforcerTwo(),ryGroup2.get(ry).get(0).getLawEnforcementItem(),ryGroup2.get(ry).get(0).getEnforcementTime(),1,
0,0,0,qyGroup1.get(k),ryGroup2.get(ry).get(0).getRemark(),row,styleRow3);
0,0,0,qyGroup1.get(k),ryGroup2.get(ry).get(0),row,styleRow3);
}
//setStyle(cellList,row,styleRow3);
}else {
@ -2483,28 +2490,28 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
""+qyGroup1.get(k),"","","",sxGroup2.get(sx).get(0).getRemark());
setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx),
qyGroup1.get(k),0,0,0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
qyGroup1.get(k),0,0,0,sxGroup2.get(sx).get(0),row,styleRow3);
} else if (3<=qyGroup1.get(k)&&qyGroup1.get(k)<=4) {
Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
"",""+qyGroup1.get(k),"","",sxGroup2.get(sx).get(0).getRemark());
setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx),
0,qyGroup1.get(k),0,0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
0,qyGroup1.get(k),0,0,sxGroup2.get(sx).get(0),row,styleRow3);
} else if (5<=qyGroup1.get(k)&&qyGroup1.get(k)<=6) {
Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
"","",""+qyGroup1.get(k),"",sxGroup2.get(sx).get(0).getRemark());
setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx),
0,0,qyGroup1.get(k),0,sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
0,0,qyGroup1.get(k),0,sxGroup2.get(sx).get(0),row,styleRow3);
}else {
Collections.addAll(cellList,""+(i+1),area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx)+"",
"","","",""+qyGroup1.get(k),sxGroup2.get(sx).get(0).getRemark());
setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(0).getEnforcementTime(),sxGroup1.get(sx),
0,0,0,qyGroup1.get(k),sxGroup2.get(sx).get(0).getRemark(),row,styleRow3);
0,0,0,qyGroup1.get(k),sxGroup2.get(sx).get(0),row,styleRow3);
}
//setStyle(cellList,row,styleRow3);
if (sxGroup1.get(sx) >= 2) {
@ -2514,11 +2521,11 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
if(s<1){
setStyle1(i+1,area,sxGroup2.get(sx).get(0).getEnterpriseName(),sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(),sxGroup2.get(sx).get(0).getLawEnforcementItem(),sxGroup2.get(sx).get(s).getEnforcementTime(),sxGroup1.get(sx),
qyGroup1.get(k),0,0,0,sxGroup2.get(sx).get(0).getRemark(),timrow,styleRow3);
qyGroup1.get(k),0,0,0,sxGroup2.get(sx).get(s),timrow,styleRow3);
}else {
setStyle1(i + 1, area, sxGroup2.get(sx).get(0).getEnterpriseName(), sxGroup2.get(sx).get(0).getBureauDeptName(),
sxGroup2.get(sx).get(0).getLawEnforcerTwo(), sxGroup2.get(sx).get(0).getLawEnforcementItem(), sxGroup2.get(sx).get(s).getEnforcementTime(), 0,
qyGroup1.get(k), 0, 0, 0, sxGroup2.get(sx).get(0).getRemark(), timrow, styleRow3);
qyGroup1.get(k), 0, 0, 0, sxGroup2.get(sx).get(s), timrow, styleRow3);
}
}
sheet.addMergedRegion(new CellRangeAddress(rowNum, (int) (rowNum - 1 + sxGroup1.get(sx)), 5, 5));//合并事项
@ -2542,7 +2549,7 @@ public class EnforcementCheckStatisticsImpl implements EnforcementCheckStatistic
rowNum++;
HSSFRow row=sheet.createRow(rowNum);
List<String> cellList=new ArrayList<>();
Collections.addAll(cellList,""+(i+1),area,"","","","","","","","","","","");
Collections.addAll(cellList,""+(i+1),area,"","","","","","","","","","","","");
setStyle(cellList,row,styleRow3);
}
}

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

@ -898,7 +898,7 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
styleRow2.setBorderLeft(BorderStyle.THIN);
styleRow2.setFont(font2);
//设置表头
String[] headerList = {"执法单位", "被执法企业名称","统一社会信用代码","企业所属区域", "企业所属街道", "执法人员","执法事项","执法时间", "联合执法", "受委托", "委托单位","行政执法类别","任务来源","是否扫码","未扫码原因","是否投诉"};
String[] headerList = {"执法单位", "被执法企业名称","统一社会信用代码","企业所属区域", "企业所属街道", "执法人员","执法事项","执法时间", "联合执法", "受委托", "委托单位","行政执法类别","任务来源","是否扫码","未扫码原因","是否投诉", "创建时间"};
HSSFRow headerRow = sheet.createRow(0);
for (int i = 0; i < headerList.length; i++) {
HSSFCell cell = headerRow.createCell(i);
@ -979,6 +979,9 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
}else {
cell11.setCellValue("是");
}
HSSFCell cellCreateTime = row.createCell(16);
cellCreateTime.setCellValue(e.getCreateTime());
cellCreateTime.setCellStyle(dateStyle);
}
//先将workbook写入字节数组，获取长度后再写入响应流，防止大文件导出时管道断开

3
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/NonEnforcementRegistrationServiceImpl.java
View File

@ -252,7 +252,7 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg
styleRow2.setFont(font2);
HSSFRow headerRow = sheet.createRow(0);
// String[] header = {"被执法企业名称","企业所属区域", "企业所属街道", "执法单位", "执法人员","执法时间","入企事由","入企事项","活动依据"};
String[] header = {"单位名称", "企业名称","统一信用码","企业注册地", "企业所属街道", "入企人员","入企时间","入企事由","入企事项","活动依据"};
String[] header = {"单位名称", "企业名称","统一信用码","企业注册地", "企业所属街道", "入企人员","入企时间","入企事由","入企事项","活动依据", "创建时间"};
for (int i = 0; i < header.length; i++) {
HSSFCell cell = headerRow.createCell(i);
HSSFRichTextString text = new HSSFRichTextString(header[i]);
@ -302,6 +302,7 @@ public class NonEnforcementRegistrationServiceImpl implements INonEnforcementReg
row.createCell(7).setCellValue(li.getLawEnforcementTypeText());
row.createCell(8).setCellValue(li.getLawEnforcementItemText());
row.createCell(9).setCellValue(li.getLawEnforcementBasisText());
row.createCell(10).setCellValue(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", li.getCreateTime()));
i[0]++;
});
}

4
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementCheckStatisticsMapper.xml
View File

@ -15,6 +15,8 @@
<result property="remark" column="remark"/>
<result property="depId" column="dep_id"/>
<result property="enterpriseAddress" column="enterprise_address"/>
<result property="enforcementTime" column="enforcement_time"/>
<result property="createTime" column="create_time"/>
</resultMap>
<select id="selectEnforcementCheckStatisticsList" parameterType="EnforcementCheckStatistics" resultMap="EnforcementCheckStatisticsResult">
@ -48,7 +50,7 @@
</select>
<select id="selectAllStatisticsList" parameterType="EnforcementCheckStatistics" resultMap="EnforcementCheckStatisticsResult">
select e.bureau_dept_name,e.bureau_dept_id,e.law_enforcement_id,e.enterprise_number,i.enterprise_name,concat(e.law_enforcer,",",e.law_enforcer_two)as lawEnforcerTwo,e.law_enforcement_item_text,e.enforcement_time,e.remark,i.enterprise_address
select e.bureau_dept_name,e.bureau_dept_id,e.law_enforcement_id,e.enterprise_number,i.enterprise_name,concat(e.law_enforcer,",",e.law_enforcer_two)as lawEnforcerTwo,e.law_enforcement_item_text,e.enforcement_time,e.remark,e.create_time,i.enterprise_address
from enforcement_registration e
left join sys_dept s on e.bureau_dept_id=s.dept_id
left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on e.enterprise_number=i.enterprise_number

3
lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml
View File

@ -132,7 +132,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
n.law_enforcement_basis_text,
n.enterprise_address,
n.district,
n.street
n.street,
n.create_time
FROM
non_enforcement_registration n
<choose>

2
lib/ZdxtComponent/pom.xml
View File

@ -53,7 +53,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.9</version>
<version>2.0.61</version>
</dependency>
</dependencies>

Write Preview
Loading…
Cancel
Save