Merge remote-tracking branch 'origin/dev' into dev

pull/4/head
fangjiakai 2024-02-04 09:15:09 +08:00
commit 2d1952b93f
57 changed files with 5193 additions and 1411 deletions

View File

@ -502,6 +502,11 @@
<artifactId>rocketmq-spring-boot-starter</artifactId>
<version>2.2.2</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.0.5</version>
</dependency>
</dependencies>
<build>

View File

@ -67,6 +67,22 @@ public class CorpInfoController extends BaseController {
private StudyTaskService studyTaskService;
@Autowired
private Smb smb;
@RequestMapping(value = "/listAll")
@ResponseBody
public Object listAll() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
List<PageData> varList = corpinfoService.listAll(pd); //列出CorpInfo列表
map.put("varList", varList);
map.put("result", errInfo);
return map;
}
/**
* @param
* @throws Exception

View File

@ -7,6 +7,8 @@ import com.zcloud.service.corp.CorpInfoService;
import com.zcloud.service.hiddenDangerCheckStandard.CommonService;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.Tools;
import com.zcloud.util.Warden;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@ -54,5 +56,22 @@ public class CommonController extends BaseController {
map.put("result", errInfo);
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/edit")
@ResponseBody
public Object edit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
Warden.updateDate(pd);
commonService.edit(pd);
map.put("result", errInfo);
return map;
}
}

View File

@ -173,7 +173,7 @@ public class CustomCheckRecordController extends BaseController {
List<JSONObject> itemsList = (List<JSONObject>) JSON.parse(pd.get("ITEMS").toString());
for (JSONObject json : itemsList) {
PageData item = new PageData();
item.put("RECORDITEM_ID", json.get("RECORDITEM_ID")); // 主键
item.put("RECORDITEM_ID", this.get32UUID()); // 主键
item.put("CUSTOM_ITEM_ID", json.get("CUSTOM_ITEM_ID"));
PageData chei = customItemService.findById(item);
item.put("ISNORMAL", json.get("ISNORMAL"));
@ -186,8 +186,7 @@ public class CustomCheckRecordController extends BaseController {
item.put("CHECK_CONTENT", chei.get("CHECK_CONTENT"));
item.put("CHECK_STANDARD", chei.get("CHECK_STANDARD"));
item.put("REFERENCE_BASIS", chei.get("REFERENCE_BASIS"));
item.put("ISNORMAL", chei.get("ISNORMAL"));
item.put("CHECK_RESULT", chei.get("CHECK_RESULT"));
item.put("CHECK_RESULT", json.get("CHECK_RESULT"));
item.put("COMMON_ITEM_SORT", chei.get("COMMON_ITEM_SORT"));
item.put("LONGITUDE", pd.get("LONGITUDE"));
item.put("LATITUDE", pd.get("LATITUDE"));
@ -195,7 +194,7 @@ public class CustomCheckRecordController extends BaseController {
item.put("ISDELETE", "0");
item.put("CREATOR_ID", Jurisdiction.getUSER_ID());
item.put("CREATOR_NAME", Jurisdiction.getUsername());
item.put("CREATOR_TIME", DateUtil.date2Str(new Date())); //删除时间
item.put("CREATE_TIME", DateUtil.date2Str(new Date())); //删除时间
customCheckRecordItemService.save(item);
}
}
@ -491,7 +490,7 @@ public class CustomCheckRecordController extends BaseController {
pd = this.getPageData();
pd = customCheckRecordService.findById(pd); // 根据ID读取
PageData condition = new PageData();
condition.put("LISTMANAGER_ID",pd.getString("LISTMANAGER_ID"));
condition.put("CUSTOM_ID",pd.getString("CUSTOM_ID"));
PageData listManager = customService.findById(condition);
pd.put("BAO_BAO_TYPE",listManager.getString("BAO_BAO_TYPE"));
PageData users = checkuserService.getCheckUser(pd);

View File

@ -5,25 +5,32 @@ import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.entity.system.Dictionaries;
import com.zcloud.logs.LogAnno;
import com.zcloud.service.check.*;
import com.zcloud.service.hiddenDangerCheckStandard.*;
import com.zcloud.service.inspection.DictionaryService;
import com.zcloud.service.offduty.OffDutyService;
import com.zcloud.service.risk.IdentificationPartsService;
import com.zcloud.service.system.DepartmentService;
import com.zcloud.service.system.PostService;
import com.zcloud.service.system.UsersService;
import com.zcloud.util.DateUtil;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.Tools;
import com.zcloud.util.Warden;
import com.zcloud.util.*;
import org.apache.commons.io.FileUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
/**
* -
@ -59,6 +66,13 @@ public class CustomController extends BaseController {
private UsersService usersService;
@Autowired
private OffDutyService offdutyService;
@Autowired
private StandardDictionaryService standardDictionaryService;
@Autowired
private DictionaryService dictionaryService;
@Autowired
private PostService postService;
/**
*
@ -94,20 +108,92 @@ public class CustomController extends BaseController {
if (pd.get("LISTITEM") != null && !pd.get("LISTITEM").equals("")) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("LISTITEM").toString());
for (JSONObject json : list) {
int commonSort = 0;
String CHECK_CATEGORY_Temp = "";
String CHECK_ITEM_Temp = "";
if (Tools.isEmpty(json.get("CHECK_CATEGORY")) || Tools.isEmpty(json.get("CHECK_ITEM"))) {
PageData dict = new PageData();
dict.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> dictList = standardDictionaryService.list(dict);
int maxsortNum = 0;
Boolean existCategory = false;
for (int j = 0; j < dictList.size(); j++) {
if ("1".equals(dictList.get(j).get("DICTIONARY_LEVEL").toString())) {
if (!dictList.get(j).get("DICTIONARY_NAME").equals(json.get("CHECK_CATEGORY_NAME"))) { //如果不存在该字典,获取最大排序号
if (maxsortNum < Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"))) {
maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"));
}
} else {
CHECK_CATEGORY_Temp = dictList.get(j).get("DICTIONARY_ID").toString();
existCategory = true;
}
}
}
if (!existCategory) {
dict.put("DICTIONARY_ID", this.get32UUID());
dict.put("DICTIONARY_LEVEL", "1");
dict.put("DICTIONARY_SORT", maxsortNum + 1);
dict.put("DICTIONARY_NAME", json.get("CHECK_CATEGORY_NAME"));
dict.put("PARENT_ID", "0");
dict.put("PARENT_IDS", dict.get("DICTIONARY_ID"));
dict.put("DICTIONARY_NAMES", dict.get("DICTIONARY_NAME"));
dict.put("DICTIONARY_SOURCE", "2");
dict.put("ISDELETE", "0");
dict.put("CREATOR_ID", Jurisdiction.getUSER_ID());
dict.put("CREATOR_NAME", Jurisdiction.getUsername());
dict.put("CREATE_TIME", DateUtil.date2Str(new Date()));
dict.put("OPERATOR_ID", Jurisdiction.getUSER_ID());
dict.put("OPERATOR_NAME", Jurisdiction.getUsername());
dict.put("OPERATE_TIME", DateUtil.date2Str(new Date()));
dict.put("DELETEOR_ID", Jurisdiction.getUSER_ID());
dict.put("DELETEOR_NAME", Jurisdiction.getUsername());
dict.put("DELETE_TIME", DateUtil.date2Str(new Date()));
standardDictionaryService.save(dict);
CHECK_CATEGORY_Temp = dict.get("DICTIONARY_ID").toString();
}
PageData dictItem = new PageData();
dictItem.putAll(dict);
maxsortNum = 0;
Boolean existItem = false;
for (int j = 0; j < dictList.size(); j++) {
if ("2".equals(dictList.get(j).get("DICTIONARY_LEVEL").toString())) {
if (!dictList.get(j).get("DICTIONARY_NAME").equals(json.get("CHECK_ITEM_NAME"))) { //如果不存在该字典,获取最大排序号
if (maxsortNum < Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"))) {
maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"));
}
} else {
CHECK_ITEM_Temp = dictList.get(j).get("DICTIONARY_ID").toString();
existItem = true;
}
}
}
commonSort = maxsortNum == 0 ? 1 : maxsortNum;
if (!existItem) {
dictItem.put("DICTIONARY_ID", this.get32UUID());
dictItem.put("DICTIONARY_LEVEL", "2");
dictItem.put("DICTIONARY_SORT", maxsortNum + 1);
dictItem.put("DICTIONARY_NAME", json.get("CHECK_ITEM_NAME"));
dictItem.put("PARENT_ID", dict.get("DICTIONARY_ID"));
dictItem.put("PARENT_IDS", dictItem.getString("DICTIONARY_ID") + ',' + dict.getString("DICTIONARY_ID"));
dictItem.put("DICTIONARY_NAMES", dictItem.getString("DICTIONARY_NAME") + ',' + dict.getString("DICTIONARY_NAME"));
standardDictionaryService.save(dictItem);
CHECK_ITEM_Temp = dictItem.get("DICTIONARY_ID").toString();
}
}
PageData itme = new PageData();
itme.put("CUSTOM_ITEM_ID", this.get32UUID()); //主键
itme.put("CUSTOM_ID", pd.get("CUSTOM_ID"));
itme.put("CHECK_CATEGORY", json.get("CHECK_CATEGORY"));
itme.put("CHECK_ITEM", json.get("CHECK_ITEM"));
itme.put("CHECK_CATEGORY", Tools.isEmpty(json.get("CHECK_CATEGORY")) ? CHECK_CATEGORY_Temp : json.get("CHECK_CATEGORY"));
itme.put("CHECK_ITEM", Tools.isEmpty(json.get("CHECK_ITEM")) ? CHECK_ITEM_Temp : json.get("CHECK_ITEM"));
itme.put("CHECK_CONTENT", json.get("CHECK_CONTENT"));
itme.put("CHECK_STANDARD", json.get("CHECK_STANDARD"));
itme.put("REFERENCE_BASIS", json.get("REFERENCE_BASIS"));
itme.put("CHECK_QUALIFIED", json.get("CHECK_QUALIFIED"));
itme.put("CHECK_UNQUALIFIED", json.get("CHECK_UNQUALIFIED"));
itme.put("OPERATION_TYPE", json.get("OPERATION_TYPE"));
itme.put("COMMON_ITEM_SORT", Tools.notEmpty(json.get("COMMON_ITEM_SORT").toString())? json.get("COMMON_ITEM_SORT") : "");
itme.put("COMMON_ID", Tools.notEmpty(json.get("COMMON_ID").toString()) ? json.get("COMMON_ID") : "");
itme.put("COMMON_ITEM_ID", Tools.notEmpty(json.get("COMMON_ITEM_ID").toString()) ? json.get("COMMON_ITEM_ID") : "");
itme.put("COMMON_ITEM_SORT", commonSort);
itme.put("COMMON_ID", json.get("COMMON_ID") == null ? "" : json.get("COMMON_ID"));
itme.put("COMMON_ITEM_ID", json.get("COMMON_ITEM_ID") == null ? "" : json.get("COMMON_ITEM_ID"));
itme.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
itme.put("ISDELETE", "0"); //是否删除
itme.put("CREATOR_ID", Jurisdiction.getUSER_ID()); //添加人id
@ -555,36 +641,38 @@ public class CustomController extends BaseController {
// return map;
// }
/**
* @param
* @throws Exception
*/
@RequestMapping(value="/goEdit")
@ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单管理",instructionsType = "去修改页面获取数据")
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件
if (Tools.notEmpty(KEYWORDS))
pd.put("KEYWORDS", KEYWORDS.trim());
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/goEdit")
@ResponseBody
@LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "去修改页面获取数据")
public Object goEdit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); // 关键词检索条件
if (Tools.notEmpty(KEYWORDS))
pd.put("KEYWORDS", KEYWORDS.trim());
pd.put("CUSTOM_ID", pd.get("ID"));
List<PageData> varList = customItemService.listAll(pd);
pd = customService.findById(pd); //根据ID读取
List<PageData> varList = customItemService.listAll(pd);
pd = customService.findById(pd); //根据ID读取
for (PageData item : varList) {
item.put("RECORDITEM_ID", this.get32UUID()); //主键
}
for (PageData item : varList) {
item.put("RECORDITEM_ID", this.get32UUID()); //主键
}
// List<PageData> ideList = identificationPartsService.listAllByList(pd);
map.put("varList", varList);
map.put("varList", varList);
// map.put("ideList", ideList);
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**
*
@ -756,6 +844,716 @@ public class CustomController extends BaseController {
map.put("result", errInfo); //返回结果
return map;
}
/**
* EXCEL
*
* @param file
* @return
* @throws Exception
*/
@RequestMapping(value = "/readExcel")
@ResponseBody
@Transactional
@LogAnno(menuType = "双重预防", menuServer = "隐患排查", instructionsOperate = "清单管理", instructionsType = "导入")
public Object readExcel(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception {
Map<String, String> map = new HashMap<String, String>();
String errInfo = "success";
StringBuffer errorStr = new StringBuffer();
PageData pd = new PageData();
pd = this.getPageData(); // COURSEWAREID
if (null != file && !file.isEmpty()) {
File tempFile = new File(file.getOriginalFilename()); //新建file
FileUtils.copyInputStreamToFile(file.getInputStream(), tempFile); //将MultipartFile复制到File
List<PageData> listPd = (List) ObjectExcelRead.readExcel(tempFile, 2, 0, 0); //执行读EXCEL操作,读出的数据导入List 2:从第3行开始0:从第A列开始0:第0个sheet
/**
* var0 :
* var1 :
* var2 :
* var3 :
* var4 :
* var5 :
* var6 :
* var7 :
* var8 :
* var9 :
* var10 :
* var11 :
* var12 :
* var13 :
* var14 :
* var15 :
* var16 :
* var17 :
* var18 :
*/
List<String> header = new ArrayList<>();
header.add("序号");
header.add("清单名称");
header.add("是否包保责任人任务");
header.add("任务类型");
header.add("部门");
header.add("岗位");
header.add("负责人");
header.add("排查类型");
header.add("排查周期");
header.add("清单类型");
header.add("排查日期");
header.add("检查类别");
header.add("检查项目");
header.add("检查内容");
header.add("检查标准");
header.add("参考依据");
header.add("检查合格项");
header.add("检查不合格项");
header.add("操作类型");
if (listPd.size() > 0) {
/**
*
* excel
*
*
* CD ( )
*
*
*/
// 查询任务类型
List<Dictionaries> taskTypeList = dictionaryService.listSubDictByParentId("7a1afe8a5e594b6a9e0cef42bd00f352");
Map<String, String> taskTypeDegreeMap = taskTypeList.stream().collect(Collectors.toMap(Dictionaries::getNAME, Dictionaries::getDICTIONARIES_ID));
// 排查类型
List<Dictionaries> troubleshootingTypeList = dictionaryService.listSubDictByParentId("dc92de8a375c4b638b1b9f8d374e6426");
Map<String, String> troubleshootingTypeDegreeMap = troubleshootingTypeList.stream().collect(Collectors.toMap(Dictionaries::getNAME, Dictionaries::getBIANMA));
// 排查周期
List<Dictionaries> troubleshootingCycleList = dictionaryService.listSubDictByParentId("f60cf0e8315b4993b6d6049dd29f2ba5");
Map<String, String> troubleshootingCycleDegreeMap = troubleshootingCycleList.stream().collect(Collectors.toMap(Dictionaries::getNAME, Dictionaries::getBIANMA));
// 清单类型
List<Dictionaries> inventoryTypeList = dictionaryService.listSubDictByParentId("4a3d0d99b0ea4e268c11dd0b18866917");
Map<String, String> inventoryTypeDegreeMap = inventoryTypeList.stream().collect(Collectors.toMap(Dictionaries::getNAME, Dictionaries::getBIANMA));
// List<Dictionaries> departmentList = dictionaryService.listSubDictByParentId("4a3d0d99b0ea4e268c11dd0b18866917");
List<PageData> listAll = new ArrayList<>();
Integer number = 1;//行数,用于提示用户
for (PageData lpd : listPd) {
try {
number++;
for (int i = 0; i < 19; i++) {
if (i == 0) { // var0 :序号 非必填
continue;
}
if (!lpd.containsKey("var" + i) || Tools.isEmpty(lpd.get("var" + i))) {
if ("任务类型".equals(header.get(i))) {
continue;
}
if ("排查日期".equals(header.get(i))) {
continue;
}
if ("参考依据".equals(header.get(i))) {
continue;
}
errorStr.append("第" + number + "行的" + header.get(i) + "无数据;\n");
continue;
}
if (lpd.get("var" + i).toString().length() >= 250) { //限制内容长度
errorStr.append("第" + number + "行的 \"" + header.get(i) + "\"字符长度超出,请精简的250内;\n");
}
}
String NAME = Tools.excelHandle(lpd.get("var1"));
String BAO_BAO_TYPE = lpd.get("var2") == "是" ? "1" : "0";
String TASK_TYPE = taskTypeDegreeMap.get(Tools.excelHandle(lpd.get("var3")));
String DEPARTMENT_NAME = Tools.excelHandle(lpd.get("var4"));
PageData depPd = new PageData();
depPd.put("NAME", DEPARTMENT_NAME);
depPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
PageData depInfo = departmentService.findByName(depPd);
String DEPARTMENT_ID = "";
if (depInfo != null && Tools.notEmpty(depInfo.getString("DEPARTMENT_ID"))) {
DEPARTMENT_ID = depInfo.get("DEPARTMENT_ID").toString();
}else {
errorStr.append("第" + number + "行的部门不存在;\n");
continue;
}
PageData postPd = new PageData();
postPd.put("DEPARTMENT_ID", DEPARTMENT_ID);
postPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
postPd.put("NAME", Tools.excelHandle(lpd.get("var5")));
List<PageData> postList = postService.listAll(postPd);
String POST_ID = "";
if (postList.size() != 0 && Tools.notEmpty(postList.get(0).getString("POST_ID"))) {
POST_ID = postList.get(0).getString("POST_ID");
} else {
errorStr.append("第" + number + "行的岗位不存在;\n");
continue;
}
PageData userPd = new PageData();
userPd.put("DEPARTMENT_ID", DEPARTMENT_ID);
userPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
userPd.put("POST_ID", POST_ID);
userPd.put("NAME", Tools.excelHandle(lpd.get("var6")));
List<PageData> userList = usersService.listAllUser(userPd);
String USER_ID = "";
if (userList.size() != 0 && Tools.notEmpty(userList.get(0).getString("USER_ID"))) {
USER_ID = userList.get(0).getString("USER_ID");
} else {
errorStr.append("第" + number + "行的负责人不存在;\n");
continue;
}
String SCREENTYPE = troubleshootingTypeDegreeMap.get(Tools.excelHandle(lpd.get("var7")));
String PERIOD = troubleshootingCycleDegreeMap.get(Tools.excelHandle(lpd.get("var8")));
String TYPE = inventoryTypeDegreeMap.get(Tools.excelHandle(lpd.get("var9")));
String CHECK_CATEGORY = Tools.excelHandle(lpd.get("var11"));
String CHECK_ITEM = Tools.excelHandle(lpd.get("var12"));
String CHECK_CONTENT = Tools.excelHandle(lpd.get("var13"));
String CHECK_STANDARD = Tools.excelHandle(lpd.get("var14"));
String REFERENCE_BASIS = Tools.excelHandle(lpd.get("var15"));
String CHECK_QUALIFIED = Tools.excelHandle(lpd.get("var16"));
String CHECK_UNQUALIFIED = Tools.excelHandle(lpd.get("var17"));
String OPERATION_TYPE = Tools.excelHandle(lpd.get("var18"));
//检查类别和检查项目如果字典里存在,则不存字典,如果不存在,则存一下
PageData dict = new PageData();
dict.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> dictList = standardDictionaryService.list(dict);
int maxsortNum = 0;
Boolean exist = false;
for (int j = 0; j < dictList.size(); j++) {
if ("1".equals(dictList.get(j).get("DICTIONARY_LEVEL").toString())) {
if (!dictList.get(j).get("DICTIONARY_NAME").equals(CHECK_CATEGORY)) { //如果不存在该字典,获取最大排序号
if (maxsortNum < Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"))) {
maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"));
}
} else {
exist = true;
}
}
}
if (!exist) {
dict.put("DICTIONARY_ID", this.get32UUID());
dict.put("DICTIONARY_LEVEL", "1");
dict.put("DICTIONARY_SORT", maxsortNum + 1);
dict.put("DICTIONARY_NAME", CHECK_CATEGORY);
dict.put("PARENT_ID", "0");
dict.put("PARENT_IDS", dict.get("DICTIONARY_ID"));
dict.put("DICTIONARY_NAMES", dict.get("DICTIONARY_NAME"));
dict.put("DICTIONARY_SOURCE", "2");
dict.put("ISDELETE", "0");
dict.put("CREATOR_ID", Jurisdiction.getUSER_ID());
dict.put("CREATOR_NAME", Jurisdiction.getUsername());
dict.put("CREATE_TIME", DateUtil.date2Str(new Date()));
dict.put("OPERATOR_ID", Jurisdiction.getUSER_ID());
dict.put("OPERATOR_NAME", Jurisdiction.getUsername());
dict.put("OPERATE_TIME", DateUtil.date2Str(new Date()));
dict.put("DELETEOR_ID", Jurisdiction.getUSER_ID());
dict.put("DELETEOR_NAME", Jurisdiction.getUsername());
dict.put("DELETE_TIME", DateUtil.date2Str(new Date()));
standardDictionaryService.save(dict);
}
PageData dictItem = new PageData();
dictItem.putAll(dict);
maxsortNum = 0;
exist = false;
for (int j = 0; j < dictList.size(); j++) {
if ("2".equals(dictList.get(j).get("DICTIONARY_LEVEL").toString())) {
if (!dictList.get(j).get("DICTIONARY_NAME").equals(CHECK_ITEM)) { //如果不存在该字典,获取最大排序号
if (maxsortNum < Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"))) {
maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"));
}
} else {
exist = true;
}
}
}
maxsortNum = maxsortNum == 0 ? 1 : maxsortNum;
if (!exist) {
dictItem.put("DICTIONARY_ID", this.get32UUID());
dictItem.put("DICTIONARY_LEVEL", "2");
dictItem.put("DICTIONARY_SORT", maxsortNum + 1);
dictItem.put("DICTIONARY_NAME", CHECK_ITEM);
dictItem.put("PARENT_ID", dict.get("DICTIONARY_ID"));
dictItem.put("PARENT_IDS", dictItem.getString("DICTIONARY_ID") + ',' + dict.getString("DICTIONARY_ID"));
dictItem.put("DICTIONARY_NAMES", dictItem.getString("DICTIONARY_NAME") + ',' + dict.getString("DICTIONARY_NAME"));
standardDictionaryService.save(dictItem);
}
// 隐患排查清单保存
PageData customData = new PageData();
customData.put("CUSTOM_ID", this.get32UUID());
customData.put("NAME", NAME);
customData.put("BAO_BAO_TYPE", BAO_BAO_TYPE);
customData.put("TASK_TYPE", TASK_TYPE);
customData.put("DEPARTMENT_ID", DEPARTMENT_ID);
customData.put("POST_ID", POST_ID);
customData.put("USER_ID", USER_ID);
customData.put("SCREENTYPE", SCREENTYPE);
customData.put("PERIOD", PERIOD);
customData.put("TYPE", TYPE);
customData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
customData.put("ISDELETE", "0"); //是否删除
customData.put("CREATOR", Jurisdiction.getUsername()); //添加人
customData.put("CREATTIME", DateUtil.date2Str(new Date())); //创建时间
customData.put("OPERATOR", Jurisdiction.getUsername()); //修改人
customData.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
customService.save(customData);
// 隐患排查清单检查项保存
PageData customItemData = new PageData();
customItemData.putAll(customData);
customItemData.put("CUSTOM_ITEM_ID", this.get32UUID()); //主键
customItemData.put("CHECK_CATEGORY", CHECK_CATEGORY);
customItemData.put("CHECK_ITEM", CHECK_ITEM);
customItemData.put("CHECK_CONTENT", CHECK_CONTENT);
customItemData.put("CHECK_STANDARD", CHECK_STANDARD);
customItemData.put("REFERENCE_BASIS", REFERENCE_BASIS);
customItemData.put("CHECK_QUALIFIED", CHECK_QUALIFIED);
customItemData.put("CHECK_UNQUALIFIED", CHECK_UNQUALIFIED);
customItemData.put("OPERATION_TYPE", OPERATION_TYPE == "选择" ? "1" : "2");
customItemData.put("COMMON_ITEM_SORT", dictItem.get("DICTIONARY_SORT"));
customItemData.put("CREATOR_ID", Jurisdiction.getUSER_ID());
customItemData.put("CREATOR_NAME", Jurisdiction.getUsername());
customItemData.put("CREATE_TIME", DateUtil.date2Str(new Date()));
customItemData.put("OPERATOR_ID", Jurisdiction.getUSER_ID());
customItemData.put("OPERATOR_NAME", Jurisdiction.getUsername());
customItemData.put("OPERATE_TIME", DateUtil.date2Str(new Date()));
customItemData.put("DELETEOR_ID", Jurisdiction.getUSER_ID());
customItemData.put("DELETEOR_NAME", Jurisdiction.getUsername());
customItemData.put("DELETE_TIME", DateUtil.date2Str(new Date()));
customItemService.save(customItemData);
listAll.add(customData);
// 修改清单统计
PageData newpd = new PageData();
newpd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
newpd.put("CUSTOM_ID", customData.get("CUSTOM_ID"));
if ("listType0005".equals(TYPE)) {
newpd.put("CUSTOMSTATISTICS_ID", this.get32UUID()); //主键
newpd.put("STARTTIME", newpd.get("START_DATE").toString() + " 00:00:00");
newpd.put("ENDTIME", newpd.get("END_DATE").toString() + " 23:59:59");
newpd.put("PERIOD", null);
PageData statistics = customStatisticsService.findByCondition(newpd);
if (statistics != null && statistics.get("LISTSTATISTICS_ID") != null) {
statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString()) - 2);
customStatisticsService.edit(statistics);
}
newpd.put("ISSTATISTICS", '0');
// 本期已检查的不计入统计
customCheckRecordService.editStatistics(newpd);
} else {
switch (PERIOD) {
case "checkPeriod0001"://每日
newpd.put("STARTTIME", DateUtil.getDay() + " 00:00:00");
newpd.put("ENDTIME", DateUtil.getDay() + " 23:59:59");
break;
case "checkPeriod0002"://每周
newpd.put("STARTTIME", DateUtil.getWeekStart());
newpd.put("ENDTIME", DateUtil.getWeekEnd());
break;
case "checkPeriod0003"://每旬
String year = DateUtil.getYear().toString();
String month = DateUtil.getMonth().toString();
Integer day = Integer.parseInt(DateUtil.getOnlyDay().toString());
String startTime = year + "-" + month + "-";
String endTime = year + "-" + month + "-";
if (day <= 10) {
startTime = startTime + "01 00:00:00";
endTime = endTime + "10 23:59:59";
} else if (day > 10 && day <= 20) {
startTime = startTime + "11 00:00:00";
endTime = endTime + "20 23:59:59";
} else {
startTime = startTime + "21 00:00:00";
endTime = DateUtil.getMonthEndDay() + " 23:59:59";
}
newpd.put("STARTTIME", startTime);
newpd.put("ENDTIME", endTime);
break;
case "checkPeriod0004"://每月
newpd.put("STARTTIME", DateUtil.getMonthFirstDay() + " 00:00:00");
newpd.put("ENDTIME", DateUtil.getMonthEndDay() + " 23:59:59");
break;
case "checkPeriod0005"://每季
newpd.put("STARTTIME", DateUtil.quarterStart() + " 00:00:00");
newpd.put("ENDTIME", DateUtil.quarterEnd() + " 23:59:59");
break;
case "checkPeriod0006"://每年
newpd.put("STARTTIME", DateUtil.getCurrYearFirst() + " 00:00:00");
newpd.put("ENDTIME", DateUtil.getCurrYearLast() + " 23:59:59");
break;
case "checkPeriod0007"://半年
String byear = DateUtil.getYear().toString();
Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString());
if (bmonth <= 6) {
pd.put("STARTTIME", byear + "-01-01 00:00:00");
pd.put("ENDTIME", byear + "-06-30 23:59:59");
} else if (bmonth > 6) {
pd.put("STARTTIME", byear + "-07-01 00:00:00");
pd.put("ENDTIME", byear + "-12-31 23:59:59");
}
break;
default:
break;
}
PageData statistics = customStatisticsService.findByCondition(newpd);
if (statistics != null && statistics.get("LISTSTATISTICS_ID") != null) {
statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString()) - 1);
customStatisticsService.edit(statistics);
}
newpd.put("ISSTATISTICS", '0');
// 本期已检查的不计入统计
customCheckRecordService.editStatistics(newpd);
}
} catch (Exception e) {
map.put("result", "fail"); //返回结果
errorStr.append("第" + number + "行数据出现错误;<br/>");
return map;
}
}
if (Tools.isEmpty(errorStr.toString())) {
errorStr.append("成功导入" + listAll.size() + "条数据!");
} else {
errInfo = "error";
}
FileUtils.deleteQuietly(tempFile);//删除临时文件
} else {
map.put("result", "fail");//返回结果
map.put("msg", "Excel数据为空请检查数据后重新上传");
FileUtils.deleteQuietly(tempFile);//删除临时文件
return map;
}
}
map.put("result", errInfo); //返回结果
map.put("msg", errorStr.toString()); //返回结果
map.put("resultStr", errorStr.toString());
return map;
}
/**
* @param
* @throws Exception
*/
@RequestMapping(value="/edit")
// @RequiresPermissions("listmanager:edit")
@ResponseBody
@LogAnno(menuType= "双重预防",menuServer= "隐患排查",instructionsOperate = "清单管理",instructionsType = "修改")
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("OPERATOR", Jurisdiction.getUsername()); //修改人
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
// 查询原数据
PageData oldPd = customService.findById(pd);
PageData pd2 = new PageData(); //删除原有内容
pd2.put("CUSTOM_ID", pd.getString("CUSTOM_ID"));
List<PageData> varList = customItemService.listAll(pd2); //
for (PageData pageData : varList) {
PageData citem = new PageData();
citem.put("CUSTOM_ITEM_ID", pageData.getString("CUSTOM_ITEM_ID"));
customItemService.delete(citem);
}
if(pd.get("LISTITEM")!=null && !pd.get("LISTITEM").equals("")) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.get("LISTITEM").toString());
for (JSONObject json : list) {
int commonSort = 0;
String CHECK_CATEGORY_Temp = "";
String CHECK_ITEM_Temp = "";
if (Tools.isEmpty(json.get("CHECK_CATEGORY")) || Tools.isEmpty(json.get("CHECK_ITEM"))) {
PageData dict = new PageData();
dict.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
List<PageData> dictList = standardDictionaryService.list(dict);
int maxsortNum = 0;
Boolean existCategory = false;
for (int j = 0; j < dictList.size(); j++) {
if ("1".equals(dictList.get(j).get("DICTIONARY_LEVEL").toString())) {
if (!dictList.get(j).get("DICTIONARY_NAME").equals(json.get("CHECK_CATEGORY_NAME"))) { //如果不存在该字典,获取最大排序号
if (maxsortNum < Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"))) {
maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"));
}
} else {
CHECK_CATEGORY_Temp = dictList.get(j).get("DICTIONARY_ID").toString();
existCategory = true;
}
}
}
if (!existCategory) {
dict.put("DICTIONARY_ID", this.get32UUID());
dict.put("DICTIONARY_LEVEL", "1");
dict.put("DICTIONARY_SORT", maxsortNum + 1);
dict.put("DICTIONARY_NAME", json.get("CHECK_CATEGORY_NAME"));
dict.put("PARENT_ID", "0");
dict.put("PARENT_IDS", dict.get("DICTIONARY_ID"));
dict.put("DICTIONARY_NAMES", dict.get("DICTIONARY_NAME"));
dict.put("DICTIONARY_SOURCE", "2");
dict.put("ISDELETE", "0");
dict.put("CREATOR_ID", Jurisdiction.getUSER_ID());
dict.put("CREATOR_NAME", Jurisdiction.getUsername());
dict.put("CREATE_TIME", DateUtil.date2Str(new Date()));
dict.put("OPERATOR_ID", Jurisdiction.getUSER_ID());
dict.put("OPERATOR_NAME", Jurisdiction.getUsername());
dict.put("OPERATE_TIME", DateUtil.date2Str(new Date()));
dict.put("DELETEOR_ID", Jurisdiction.getUSER_ID());
dict.put("DELETEOR_NAME", Jurisdiction.getUsername());
dict.put("DELETE_TIME", DateUtil.date2Str(new Date()));
standardDictionaryService.save(dict);
CHECK_CATEGORY_Temp = dict.get("DICTIONARY_ID").toString();
}
PageData dictItem = new PageData();
dictItem.putAll(dict);
maxsortNum = 0;
Boolean existItem = false;
for (int j = 0; j < dictList.size(); j++) {
if ("2".equals(dictList.get(j).get("DICTIONARY_LEVEL").toString())) {
if (!dictList.get(j).get("DICTIONARY_NAME").equals(json.get("CHECK_ITEM_NAME"))) { //如果不存在该字典,获取最大排序号
if (maxsortNum < Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"))) {
maxsortNum = Integer.parseInt(dictList.get(j).getString("DICTIONARY_SORT"));
}
} else {
CHECK_ITEM_Temp = dictList.get(j).get("DICTIONARY_ID").toString();
existItem = true;
}
}
}
commonSort = maxsortNum == 0 ? 1 : maxsortNum;
if (!existItem) {
dictItem.put("DICTIONARY_ID", this.get32UUID());
dictItem.put("DICTIONARY_LEVEL", "2");
dictItem.put("DICTIONARY_SORT", maxsortNum + 1);
dictItem.put("DICTIONARY_NAME", json.get("CHECK_ITEM_NAME"));
dictItem.put("PARENT_ID", dict.get("DICTIONARY_ID"));
dictItem.put("PARENT_IDS", dictItem.getString("DICTIONARY_ID") + ',' + dict.getString("DICTIONARY_ID"));
dictItem.put("DICTIONARY_NAMES", dictItem.getString("DICTIONARY_NAME") + ',' + dict.getString("DICTIONARY_NAME"));
standardDictionaryService.save(dictItem);
CHECK_ITEM_Temp = dictItem.get("DICTIONARY_ID").toString();
}
}
PageData itme = new PageData();
itme.put("CUSTOM_ITEM_ID", this.get32UUID()); //主键
itme.put("CUSTOM_ID", pd.get("CUSTOM_ID"));
itme.put("CHECK_CATEGORY", Tools.isEmpty(json.get("CHECK_CATEGORY")) ? CHECK_CATEGORY_Temp : json.get("CHECK_CATEGORY"));
itme.put("CHECK_ITEM", Tools.isEmpty(json.get("CHECK_ITEM")) ? CHECK_ITEM_Temp : json.get("CHECK_ITEM"));
itme.put("CHECK_CONTENT", json.get("CHECK_CONTENT"));
itme.put("CHECK_STANDARD", json.get("CHECK_STANDARD"));
itme.put("REFERENCE_BASIS", json.get("REFERENCE_BASIS"));
itme.put("CHECK_QUALIFIED", json.get("CHECK_QUALIFIED"));
itme.put("CHECK_UNQUALIFIED", json.get("CHECK_UNQUALIFIED"));
itme.put("OPERATION_TYPE", json.get("OPERATION_TYPE"));
itme.put("COMMON_ITEM_SORT", commonSort);
itme.put("COMMON_ID", json.get("COMMON_ID") == null ? "" : json.get("COMMON_ID"));
itme.put("COMMON_ITEM_ID", json.get("COMMON_ITEM_ID") == null ? "" : json.get("COMMON_ITEM_ID"));
itme.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业
itme.put("ISDELETE", "0"); //是否删除
itme.put("CREATOR_ID", Jurisdiction.getUSER_ID()); //添加人id
itme.put("CREATOR_NAME", Jurisdiction.getUsername()); //添加人
itme.put("CREATE_TIME", DateUtil.date2Str(new Date())); //创建时间
itme.put("OPERATOR_ID", Jurisdiction.getUSER_ID()); //修改人
itme.put("OPERATOR_NAME", Jurisdiction.getUsername()); //修改时间
itme.put("OPERATE_TIME", DateUtil.date2Str(new Date())); //修改时间
itme.put("DELETEOR_ID", Jurisdiction.getUSER_ID()); //添加人id
itme.put("DELETEOR_NAME", Jurisdiction.getUsername()); //添加人
itme.put("DELETE_TIME", DateUtil.date2Str(new Date())); //删除时间
customItemService.save(itme);
}
}
if(pd.getString("TYPE").equals("listType0006")){
pd.put("ISDELETE","-99");
}else {
pd.put("ISDELETE","0");
}
customService.edit(pd); // 修改清单管理的内容
oldPd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
// 修改清单统计
if(oldPd.get("TYPE") != null && Tools.notEmpty(oldPd.get("TYPE").toString())) {
oldPd.put("CUSTOMSTATISTICS_ID", this.get32UUID()); //主键
if("listType0005".equals(oldPd.get("TYPE").toString())) {
oldPd.put("STARTTIME", oldPd.get("START_DATE").toString()+" 00:00:00");
oldPd.put("ENDTIME", oldPd.get("END_DATE").toString()+" 23:59:59");
oldPd.put("PERIOD", null);
PageData statistics = customStatisticsService.findByCondition(oldPd);
if(statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) {
if(Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())-2 <=0) {
customStatisticsService.deletewl(statistics);
} else {
statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())-2);
customStatisticsService.edit(statistics);
}
}
} else {
if(oldPd.get("PERIOD") != null && Tools.notEmpty(oldPd.get("PERIOD").toString())) {
String period = oldPd.get("PERIOD").toString();
switch (period) {
case "checkPeriod0001"://每日
oldPd.put("STARTTIME", DateUtil.getDay()+" 00:00:00");
oldPd.put("ENDTIME", DateUtil.getDay()+" 23:59:59");
break;
case "checkPeriod0002"://每周
oldPd.put("STARTTIME", DateUtil.getWeekStart());
oldPd.put("ENDTIME", DateUtil.getWeekEnd());
break;
case "checkPeriod0003"://每旬
String year = DateUtil.getYear().toString();
String month = DateUtil.getMonth().toString();
Integer day = Integer.parseInt(DateUtil.getOnlyDay().toString());
String startTime = year + "-" + month + "-";
String endTime = year + "-" + month + "-";
if(day <= 10) {
startTime = startTime+"01 00:00:00";
endTime = endTime+"10 23:59:59";
} else if(day > 10 && day <= 20) {
startTime = startTime+"11 00:00:00";
endTime = endTime+"20 23:59:59";
} else {
startTime = startTime+"21 00:00:00";
endTime = DateUtil.getMonthEndDay()+" 23:59:59";
}
oldPd.put("STARTTIME", startTime);
oldPd.put("ENDTIME", endTime);
break;
case "checkPeriod0004"://每月
oldPd.put("STARTTIME", DateUtil.getMonthFirstDay()+" 00:00:00");
oldPd.put("ENDTIME", DateUtil.getMonthEndDay()+" 23:59:59");
break;
case "checkPeriod0005"://每季
oldPd.put("STARTTIME", DateUtil.quarterStart()+" 00:00:00");
oldPd.put("ENDTIME", DateUtil.quarterEnd()+" 23:59:59");
break;
case "checkPeriod0006"://每年
oldPd.put("STARTTIME", DateUtil.getCurrYearFirst()+" 00:00:00");
oldPd.put("ENDTIME", DateUtil.getCurrYearLast()+" 23:59:59");
break;
case "checkPeriod0007"://半年
String byear = DateUtil.getYear().toString();
Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString());
if(bmonth <= 6) {
oldPd.put("STARTTIME", byear+"-01-01 00:00:00");
oldPd.put("ENDTIME", byear+"-06-30 23:59:59");
} else if(bmonth > 6) {
oldPd.put("STARTTIME", byear+"-07-01 00:00:00");
oldPd.put("ENDTIME", byear+"-12-31 23:59:59");
}
break;
default:
break;
}
}
PageData statistics = customStatisticsService.findByCondition(oldPd);
if(statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) {
if(Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())-1 <=0) {
customStatisticsService.deletewl(statistics);
} else {
statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())-1);
customStatisticsService.edit(statistics);
}
}
}
}
if(pd.get("TYPE") != null && Tools.notEmpty(pd.get("TYPE").toString())) {
pd.put("CUSTOMSTATISTICS_ID", this.get32UUID()); //主键
if("listType0005".equals(pd.get("TYPE").toString())) {
pd.put("STARTTIME", pd.get("START_DATE").toString()+" 00:00:00");
pd.put("ENDTIME", pd.get("END_DATE").toString()+" 23:59:59");
pd.put("PERIOD", null);
PageData statistics = customStatisticsService.findByCondition(pd);
if(statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) {
statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())+2);
customStatisticsService.edit(statistics);
} else {
pd.put("NOTEXAMINEDNUM", 2);
customStatisticsService.save(pd);
}
} else {
if(pd.get("PERIOD") != null && Tools.notEmpty(pd.get("PERIOD").toString())) {
String period = pd.get("PERIOD").toString();
switch (period) {
case "checkPeriod0001"://每日
pd.put("STARTTIME", DateUtil.getDay()+" 00:00:00");
pd.put("ENDTIME", DateUtil.getDay()+" 23:59:59");
break;
case "checkPeriod0002"://每周
pd.put("STARTTIME", DateUtil.getWeekStart());
pd.put("ENDTIME", DateUtil.getWeekEnd());
break;
case "checkPeriod0003"://每旬
String year = DateUtil.getYear().toString();
String month = DateUtil.getMonth().toString();
Integer day = Integer.parseInt(DateUtil.getOnlyDay().toString());
String startTime = year + "-" + month + "-";
String endTime = year + "-" + month + "-";
if(day <= 10) {
startTime = startTime+"01 00:00:00";
endTime = endTime+"10 23:59:59";
} else if(day > 10 && day <= 20) {
startTime = startTime+"11 00:00:00";
endTime = endTime+"20 23:59:59";
} else {
startTime = startTime+"21 00:00:00";
endTime = DateUtil.getMonthEndDay()+" 23:59:59";
}
pd.put("STARTTIME", startTime);
pd.put("ENDTIME", endTime);
break;
case "checkPeriod0004"://每月
pd.put("STARTTIME", DateUtil.getMonthFirstDay()+" 00:00:00");
pd.put("ENDTIME", DateUtil.getMonthEndDay()+" 23:59:59");
break;
case "checkPeriod0005"://每季
pd.put("STARTTIME", DateUtil.quarterStart()+" 00:00:00");
pd.put("ENDTIME", DateUtil.quarterEnd()+" 23:59:59");
break;
case "checkPeriod0006"://每年
pd.put("STARTTIME", DateUtil.getCurrYearFirst()+" 00:00:00");
pd.put("ENDTIME", DateUtil.getCurrYearLast()+" 23:59:59");
break;
case "checkPeriod0007"://半年
String byear = DateUtil.getYear().toString();
Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString());
if(bmonth <= 6) {
pd.put("STARTTIME", byear+"-01-01 00:00:00");
pd.put("ENDTIME", byear+"-06-30 23:59:59");
} else if(bmonth > 6) {
pd.put("STARTTIME", byear+"-07-01 00:00:00");
pd.put("ENDTIME", byear+"-12-31 23:59:59");
}
break;
default:
break;
}
}
PageData statistics = customStatisticsService.findByCondition(pd);
if(statistics != null && statistics.get("CUSTOMSTATISTICS_ID") != null) {
statistics.put("NOTEXAMINEDNUM", Integer.parseInt(statistics.get("NOTEXAMINEDNUM").toString())+1);
customStatisticsService.edit(statistics);
} else {
pd.put("NOTEXAMINEDNUM", 1);
customStatisticsService.save(pd);
}
}
}
map.put("result", errInfo);
return map;
}
//
// /**导出到excel
// * @param

View File

@ -0,0 +1,281 @@
package com.zcloud.controller.keyProjects.app;
import com.alibaba.fastjson.JSON;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.relatedparty.OutSourcedService;
import com.zcloud.service.relatedparty.UnitsService;
import com.zcloud.service.specialoperation.PersonnelManagementService;
import com.zcloud.service.system.DictionariesService;
import com.zcloud.service.video.VideoManagerService;
import com.zcloud.util.Tools;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.crypto.hash.SimpleHash;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
* luoxiaobao
* 2022-06-07
* www.zcloudchina.com
*/
@Controller
@RequestMapping("/app/keyProjects")
public class AppKeyProjectsController extends BaseController {
@Autowired
private UnitsService unitsService;
@Autowired
private OutSourcedService outsourcedService;
@Autowired
private DictionariesService dictionariesService;
@Autowired
private PersonnelManagementService personnelmanagementService;
@Autowired
private VideoManagerService videomanagerService;
/**
* @throws Exception
*/
@RequestMapping(value="/listAppZdgcgl")
@ResponseBody
public Object listAppZdgcgl(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String UserId = pd.getString("UserId");
pd.put("UserId",UserId);
if(!StringUtils.equals("1",UserId)){
pd.put("DeptId",outsourcedService.getDeptId(UserId));
}
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd);
List<PageData> varList = outsourcedService.applylist(page); //列出OutSourced列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
*
* @return
* @throws Exception
*/
@RequestMapping(value="/editDingWei")
@ResponseBody
public Object editDingWei() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
outsourcedService.editDingWei(pd); //根据ID读取
String corpInfoId = outsourcedService.getCorpInfoByOutsourcesCreator(pd);
pd.put("operatingCorpId",corpInfoId);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
/**
* @param page
* @throws Exception
*/
@RequestMapping(value="/videomanagerList")
@ResponseBody
public Object list(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
page.setPd(pd);
List<PageData> varList = videomanagerService.listApp(page); //列出VideoManager列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
* @param
* @throws Exception
*/
@RequestMapping(value="/getOutsourced")
@ResponseBody
public Object getOutsourced() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = outsourcedService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**
* @throws Exception
*/
@RequestMapping(value="/listAllUnits")
@ResponseBody
public Object listAllUnits() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
List<PageData> varList = unitsService.listAll(pd); //列出PersonnelManagement列表
map.put("varList", varList);
map.put("result", errInfo);
return map;
}
/**
* @throws Exception
*/
@RequestMapping(value="/listOutsourced")
@ResponseBody
public Object listOutsourced(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String UserId = pd.getString("UNITS_ID");
pd.put("UserId",UserId);
if(!StringUtils.equals("1",UserId)){
pd.put("DeptId",outsourcedService.getDeptId(UserId));
}
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd);
List<PageData> varList = outsourcedService. list(page); //列出OutSourced列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
* @throws Exception
*/
@RequestMapping(value="/listAllOutsourced")
@ResponseBody
public Object listAllOutsourced() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
List<PageData> varList = outsourcedService.listAll(pd); //列出PersonnelManagement列表
map.put("varList", varList);
map.put("result", errInfo);
return map;
}
/**
* @throws Exception
*/
@RequestMapping(value="/listAllPersonnel")
@ResponseBody
public Object listAllPersonnel() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
List<PageData> varList = personnelmanagementService.listAll(pd); //列出PersonnelManagement列表
map.put("varList", varList);
map.put("result", errInfo);
return map;
}
/**
* @throws Exception
*/
@RequestMapping(value="/login")
@ResponseBody
public Object login() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String pwd = new SimpleHash("SHA-1", pd.get("USERNAME"), pd.get("PASSWORD")).toString();
pd.put("PHONENUM", pd.get("USERNAME"));
pd.put("PASSWORD",pwd);
pd = personnelmanagementService.findForLogin(pd); //列出PersonnelManagement列表
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**
* @param page
* @throws Exception
*/
@RequestMapping(value="/editPwd")
@ResponseBody
public Object editPwd (Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData pageData = personnelmanagementService.findById(pd);
String oldpwd = new SimpleHash("SHA-1", pageData.getString("PHONENUM"), pd.get("OLDPASSWORD")).toString();
if(!pageData.getString("PASSWORD").equals(oldpwd)){
errInfo = "error";
map.put("msg","旧密码错误");
return map;
}
String pwd = new SimpleHash("SHA-1", pageData.getString("PHONENUM"), pd.get("PASSWORD")).toString(); //新密码
PageData updateUser = new PageData();
updateUser.put("PASSWORD", pwd);
updateUser.put("PERSONNELMANAGEMENT_ID", pageData.getString("PERSONNELMANAGEMENT_ID"));
personnelmanagementService.editPassword(updateUser);
map.put("result", errInfo);
return map;
}
/**
* @throws Exception
*/
@RequestMapping(value="/homePageData")
@ResponseBody
public Object homePageData() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = outsourcedService.homepagedata(pd); //列出PersonnelManagement列表
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
// /**去修改页面获取数据
// * @param
// * @throws Exception
// */
// @RequestMapping(value="/goEdit")
// @ResponseBody
// public Object goEdit() throws Exception{
// Map<String,Object> map = new HashMap<String,Object>();
// String errInfo = "success";
// PageData pd = new PageData();
// pd = this.getPageData();
// pd = personnelmanagementService.findByOutsourced(pd); //根据ID读取
// map.put("pd", pd);
// map.put("result", errInfo);
// return map;
// }
}

View File

@ -0,0 +1,656 @@
package com.zcloud.controller.keyProjects.app;
import java.io.File;
import java.util.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.service.keyProjects.*;
import com.zcloud.service.relatedparty.OutSourcedService;
import com.zcloud.service.specialoperation.PersonnelManagementService;
import com.zcloud.service.system.ImgFilesService;
import com.zcloud.service.system.UsersService;
import com.zcloud.util.*;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import org.springframework.web.multipart.MultipartFile;
/**
*
* luoxiaobao
* 2022-09-19
* www.zcloudchina.com
*/
@Controller
@RequestMapping("/app/keyprojectcheck")
public class AppKeyprojectCheckController extends BaseController {
@Autowired
private KeyprojectCheckService keyprojectcheckService;
@Autowired
private KeyprojectCheckInfoService keyprojectcheckInfoService;
@Autowired
private KeyprojectHiddenService keyprojectHiddenService;
@Autowired
private ImgFilesService imgFilesService;
@Autowired
private KeyprojectPunishService keyprojectPunishService;
@Autowired
private OutSourcedService outsourcedService;
@Autowired
private PersonnelManagementService personnelmanagementService;
@Autowired
private UsersService usersService;
@Autowired
private KeyprojectPunishService keyprojectpunishService;
@Autowired Smb smb;
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/add")
@ResponseBody
public Object add() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
pd.put("KEYPROJECTCHECK_ID", this.get32UUID()); //主键
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", 0); //是否删除
pd.put("SOURCE", 1); //企业ID
pd.put("CORPINFO_ID", 1); //检查人的企业id 监管端的企业id就是1
keyprojectcheckService.save(pd);
String currentTime = DateUtil.date2Str(new Date());
List<PageData> SITUATIONJSONDATA = new ArrayList<>(); //发送其他项目用
if (Tools.notEmpty(pd.getString("SITUATIONJSON"))) {
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("SITUATIONJSON"));
String time = currentTime;
for (JSONObject json : list) {
PageData situationPd = new PageData();
situationPd.put("KEYPROJECTCHECKINFO_ID", UuidUtil.get32UUID()); //主键
situationPd.put("KEYPROJECTCHECK_ID", pd.getString("KEYPROJECTCHECK_ID")); //检查ID
situationPd.put("SITUATION", json.get("SITUATION")); //检查情况
situationPd.put("ISDELETE", "0"); //是否删除(0:有效 1删除)
situationPd.put("CREATOR", pd.getString("CREATOR")); //添加人
situationPd.put("CREATTIME", time); //添加时间
situationPd.put("OPERATOR", pd.getString("OPERATOR")); //修改人
situationPd.put("OPERATTIME", time); //修改时间
keyprojectcheckInfoService.save(situationPd);
SITUATIONJSONDATA.add(situationPd);
time = DateUtil.calculateDateSecond(time, 1);
}
}
Boolean boo = false; // 增加开关控制
List<PageData> HIDDENJSONDATA = new ArrayList<>(); //发送其他项目用
if (Tools.notEmpty(pd.getString("HIDDENJSON"))) {
boo = true;
List<PageData> hiddenList = new ArrayList<PageData>();
List<JSONObject> list = (List<JSONObject>) JSON.parse(pd.getString("HIDDENJSON"));
String time = currentTime;
for (JSONObject json : list) {
PageData hidden = new PageData();
hidden.put("HIDDEN_ID", UuidUtil.get32UUID()); //主键
hidden.put("FOREIGN_ID", pd.getString("KEYPROJECTCHECK_ID")); //外键ID
hidden.put("HIDDENDESCR", json.getString("HIDDENDESCR")); //隐患描述
hidden.put("HIDDENPART", json.getString("HIDDENPART")); //隐患部位
hidden.put("HIDDENLEVEL", json.getString("HIDDENLEVEL")); //隐患级别
hidden.put("HIDDENTYPE", json.getString("HIDDENTYPE")); //隐患类型1
hidden.put("HIDDENTYPE2", json.getString("HIDDENTYPE2")); //隐患类型2
hidden.put("LONGITUDE", json.getString("LONGITUDE")); //隐患位置经度
hidden.put("LATITUDE", json.getString("LATITUDE")); //隐患位置纬度
hidden.put("DISCOVERYTIME", json.getString("DISCOVERYTIME")); //隐患发现时间
hidden.put("HIDDENFINDDEPT", json.getString("HIDDENFINDDEPT")); //隐患发现部门(隐患责任人部门)
hidden.put("RECTIFICATIONTYPE", json.getString("RECTIFICATIONTYPE")); //隐患处置
hidden.put("RECTIFICATIONDEADLINE", json.getString("RECTIFICATIONDEADLINE")); //整改期限
hidden.put("RECTIFYDESCR", json.getString("RECTIFYDESCR")); //整改描述
hidden.put("RECTIFICATIONDEPT", json.getString("RECTIFICATIONDEPT")); //整改部门
hidden.put("RECTIFICATIONOR", json.getString("RECTIFICATIONOR")); //整改人
hidden.put("CREATOR", pd.getString("CREATOR")); //发现人(隐患责任人)
hidden.put("SOURCE", json.getString("SOURCE")); //隐患来源
hidden.put("STATE", "1"); //隐患状态 100-安全环保检查暂存的隐患流程完转0
hidden.put("CREATTIME", time); //发现时间
hidden.put("CORPINFO_ID", pd.getString("CORPINFO_ID")); //企业ID
hidden.put("ISDELETE", "0"); //是否删除(0:有效 1删除)
hidden.put("POSITIONDESC", json.getString("POSITIONDESC"));// 隐患位置描述
keyprojectHiddenService.save(hidden);
hiddenList.add(hidden);
HIDDENJSONDATA.add(hidden);
time = DateUtil.calculateDateSecond(time, 1);
}
pd.put("hiddenList", hiddenList);
}
try {
//这里发送短信 通知 先判断重点工程是否要求发短信, 不发直接过,发的话 找到对应人以及对应手机号 发送对应模板短信啊
PageData outSource = new PageData();
outSource.put("OUTSOURCED_ID", pd.getString("OUTSOURCED_ID"));
outSource = outsourcedService.findById(outSource);
if (StringUtils.isNotBlank(outSource.getString("IS_SMS")) && StringUtils.equals("0", outSource.getString("IS_SMS"))) {
//发送短信 pd中 PERSONNELMANAGEMENT_ID 对应 `qa-gwj-regulatory`.`BUS_PERSONNELMANAGEMENT` 表中 PERSONNELMANAGEMENT_ID 获取到 PHONENUM 手机号字段 发送短信
PageData person = new PageData();
person.put("PERSONNELMANAGEMENT_ID", pd.getString("PERSONNELMANAGEMENT_ID"));
person = personnelmanagementService.findById(person);
// outSource.get("OUTSOURCED_NAME")
JSONArray jsonArray = new JSONArray();
//接受返回结果
JSONObject records = new JSONObject();
//定义替换参数
JSONObject tpContent = new JSONObject();
tpContent.put("OUTSOURCEDNAME", outSource.getString("OUTSOURCED_NAME"));
records = SendSmsUtil.getRecords(person.getString("PHONENUM"), tpContent);
jsonArray.add(records);
SendSmsUtil.sendSms("121451", jsonArray, null);
//发送罚款待处理 上文开关控制这里发送不
if (boo) {
List<JSONObject> jsonList = (List<JSONObject>) JSON.parse(pd.getString("HIDDENJSON"));
String PUNISHTHEPERSON = keyprojectHiddenService.getPUNISHTHEPERSON(pd);
if (!Tools.isEmpty(PUNISHTHEPERSON)) {
PageData selectPageData = new PageData();
String[] split = PUNISHTHEPERSON.split(",");
selectPageData.put("ids", split);
List<String> list = keyprojectHiddenService.getPhone(selectPageData);
for (JSONObject json : jsonList) {
for (String phone : list) {
JSONArray jsonBrray = new JSONArray();
//接受返回结果
JSONObject recordsB = new JSONObject();
//定义替换参数
JSONObject tpContentB = new JSONObject();
tpContentB.put("HIDDENDESCR", json.getString("HIDDENDESCR")); //隐患描述
if (StringUtils.isNotBlank(phone)) {
recordsB = SendSmsUtil.getRecords(phone, tpContentB);
jsonBrray.add(recordsB);
SendSmsUtil.sendSms("121487", jsonBrray, null);
}
}
}
}
}
}
} catch (Exception e) {
e.printStackTrace();
} finally {
//获取当前重点工程的所属企业 根据重点工程创建人获取
PageData dataDock = new PageData();
String corpInfoId = outsourcedService.getCorpInfoByOutsourcesCreator(pd);
pd.put("operatingCorpId", corpInfoId);
dataDock.putAll(pd);
if (SITUATIONJSONDATA.size() > 0) {
dataDock.put("SITUATIONJSONDATA", SITUATIONJSONDATA);
}
if (HIDDENJSONDATA.size() > 0) {
dataDock.put("HIDDENJSONDATA", HIDDENJSONDATA);
}
map.put("dockData", JSON.toJSONString(dataDock));
map.put("pd", pd);
map.put("result", errInfo);
}
//map.put("pd", pd);
//map.put("result", errInfo);
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/delete")
@ResponseBody
public Object delete() throws Exception {
Map<String, String> map = new HashMap<String, String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
keyprojectcheckService.delete(pd);
map.put("result", errInfo); //返回结果
String corpInfoId = outsourcedService.getCorpInfoByOutsourcesCreator(pd);
pd.put("operatingCorpId", corpInfoId);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/edit")
@ResponseBody
public Object edit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
keyprojectcheckService.edit(pd);
map.put("result", errInfo);
String corpInfoId = outsourcedService.getCorpInfoByOutsourcesCreator(pd);
pd.put("operatingCorpId", corpInfoId);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/confirm")
@ResponseBody
public Object confirm(@RequestParam(value = "FFILE", required = false) MultipartFile PERSON_SIGN) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
ArrayList<String> pictureList = new ArrayList<>();
if (PERSON_SIGN != null) {
// MultipartFile file = BASE64DecodedMultipartFile.base64ToMultipart(pd.getString("PERSON_SIGN"));
String suffixName = PERSON_SIGN.getOriginalFilename().substring(PERSON_SIGN.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
map.put("result", "fail");
map.put("exception", "上传文件格式不正确");
return map;
}
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + PERSON_SIGN.getOriginalFilename().substring(PERSON_SIGN.getOriginalFilename().lastIndexOf("."));
pd.put("PERSON_SIGN_IMG", Const.FILEPATHFILE + ffile + "/" + fileName);
pd.put("PERSON_SIGN_TIME", DateUtil.date2Str(new Date()));
smb.sshSftp(PERSON_SIGN, fileName, Const.FILEPATHFILE + ffile);
pictureList.add(pd.getString("PERSON_SIGN_IMG") +
"@@"
+ fileName);
}
keyprojectcheckService.confirm(pd);
try {
//这里发送短信 判断公司是否需要发送短信 然后判断是否有隐患 有则发送 没有不发送
List<PageData> smsList = keyprojectcheckService.getSmsList(pd);
if (!Tools.isEmpty(smsList)) {
for (PageData pageData : smsList) {
JSONArray jsonArray = new JSONArray();
//接受返回结果
JSONObject records = new JSONObject();
//定义替换参数
JSONObject tpContent = new JSONObject();
tpContent.put("HIDDENDESCR", pageData.getString("HIDDENDESCR"));
records = SendSmsUtil.getRecords(pageData.getString("PHONENUM"), tpContent);
jsonArray.add(records);
SendSmsUtil.sendSms("121486", jsonArray, null);
}
}
} catch (Exception e) {
e.printStackTrace();
} finally {
map.put("result", errInfo);
}
map.put("sendPicturesList", JSON.toJSONString(pictureList));
PageData pageData = keyprojectcheckService.findById(pd);
String corpInfoId = outsourcedService.getCorpInfoByOutsourcesCreator(pageData);
pd.put("operatingCorpId", corpInfoId);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
/**
*
*
* @param page
* @throws Exception
*/
@RequestMapping(value = "/list")
@ResponseBody
public Object list(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd);
List<PageData> varList = keyprojectcheckService.list(page); //列出KeyprojectCheck列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/goEdit")
@ResponseBody
public Object goEdit() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = keyprojectcheckService.findById(pd); //根据ID读取
List<PageData> situationList = keyprojectcheckInfoService.listAll(pd);
pd.put("FOREIGN_ID", pd.getString("KEYPROJECTCHECK_ID"));
pd.put("hiddenList", keyprojectHiddenService.listAllInspection(pd));
pd.put("situationList", situationList);
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/listHidden")
@ResponseBody
public Object listHidden(Page page) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if (Tools.notEmpty(KEYWORDS)) pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd);
List<PageData> varList = keyprojectHiddenService.list(page); //列出KeyprojectCheck列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/findHidden")
@ResponseBody
public Object findHidden() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = keyprojectHiddenService.findById(pd); //根据ID读取
PageData pd2 = new PageData();
pd2.put("FOREIGN_KEY", pd.getString("HIDDEN_ID"));
pd2.put("TYPE", 3); //隐患报警图片
pd.put("hiddenImgs", imgFilesService.listAll(pd2));
if (imgFilesService.listAll(pd2).size() == 0) {
pd2.put("TYPE", 114); //AI隐患图片
pd.put("hiddenImgs", imgFilesService.listAll(pd2));
}
pd2.put("TYPE", 102); //隐患视频
pd.put("hiddenVideos", imgFilesService.listAll(pd2));
pd2.put("TYPE", 4);
pd.put("zgImgs", imgFilesService.listAll(pd2));//整改图片
pd2.put("TYPE", 5);
pd.put("ysImgs", imgFilesService.listAll(pd2));//整改图片
PageData findTicketData = new PageData();
findTicketData.put("HIDDEN_ID", pd.getString("HIDDEN_ID"));
pd.put("punishForm", keyprojectpunishService.findById(findTicketData));
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/rectify")
@ResponseBody
@Transactional
public Object rectify(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("STATE", 2);
keyprojectHiddenService.editstate(pd);
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
map.put("result", "fail");
map.put("exception", "上传文件格式不正确");
return map;
}
}
for (int i = 0; i < files.length; i++) {
MultipartFile file = files[i];
String ffile = DateUtil.getDays();
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
PageData img = new PageData();
String id = this.get32UUID();
img.put("IMGFILES_ID", id);
img.put("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName);
img.put("TYPE", 4);
img.put("FOREIGN_KEY", pd.get("HIDDEN_ID"));
imgFilesService.save(img);
}
}
map.put("result", errInfo);
String corpInfoId = keyprojectHiddenService.getCorpInfoIdByHiddenId(pd);
pd.put("operatingCorpId", corpInfoId);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/check")
@ResponseBody
@Transactional
public Object check() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("STATE", 4);
keyprojectHiddenService.editstate(pd);
//根据隐患获取重点工程所属企业
String corpInfoId = keyprojectHiddenService.getCorpInfoIdByHiddenId(pd);
pd.put("operatingCorpId", corpInfoId);
map.put("dockData", JSON.toJSONString(pd));
map.put("result", errInfo);
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/deleteAll")
@ResponseBody
public Object deleteAll() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if (Tools.notEmpty(DATA_IDS)) {
String ArrayDATA_IDS[] = DATA_IDS.split(",");
keyprojectcheckService.deleteAll(ArrayDATA_IDS);
errInfo = "success";
} else {
errInfo = "error";
}
map.put("result", errInfo); //返回结果
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/keyProjectCount")
@ResponseBody
public Object keyProjectCount() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = keyprojectHiddenService.keyprojectcount(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/editHiddenIspunish")
@ResponseBody
@Transactional
public Object editHiddenIspunish() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
keyprojectHiddenService.editstate(pd);
map.put("result", errInfo);
map.put("dockData", JSON.toJSONString(pd));
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/rectifyOnlyFile")
@ResponseBody
@Transactional
public Object rectifyOnlyFile(@RequestParam(value = "FFILE", required = false) MultipartFile[] files) throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
if (files.length > 1) {
map.put("result", "fail");
map.put("exception", "一次性上传图片过多!");
return map;
}
if (files != null) {
MultipartFile file = files[0];
String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
map.put("result", "fail");
map.put("exception", "上传文件格式不正确");
return map;
}
String ffile = DateUtil.getDays();
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
String fileName = this.get32UUID() + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
PageData img = new PageData();
String IMGFILES_ID = this.get32UUID();
img.put("IMGFILES_ID", IMGFILES_ID);
img.put("FILEPATH", Const.FILEPATHFILE + ffile + "/" + fileName);
img.put("TYPE", 4);
img.put("FOREIGN_KEY", pd.get("HIDDEN_ID"));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile);
imgFilesService.save(img);
}
map.put("result", errInfo);
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/rectifyOnlyForm")
@ResponseBody
@Transactional
public Object rectifyOnlyForm() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("STATE", 2);
keyprojectHiddenService.editstate(pd);
try {
//发送 隐患待验收模板 短信
//这里发送短信 判断公司是否需要发送短信 然后判断是否有隐患 有则发送 没有不发送
String HIDDENDESCR = "";
List<PageData> smsList = keyprojectHiddenService.getSmsList(pd);
if (!Tools.isEmpty(smsList)) {
for (PageData pageData : smsList) {
JSONArray jsonArray = new JSONArray();
//接受返回结果
JSONObject records = new JSONObject();
//定义替换参数
JSONObject tpContent = new JSONObject();
tpContent.put("HIDDENDESCR", pageData.getString("HIDDENDESCR"));
HIDDENDESCR = pageData.getString("HIDDENDESCR");
records = SendSmsUtil.getRecords(pageData.getString("PHONE"), tpContent);
jsonArray.add(records);
SendSmsUtil.sendSms("121488", jsonArray, null);
}
}
} catch (Exception e) {
e.printStackTrace();
} finally {
map.put("result", errInfo);
}
map.put("result", errInfo);
pd.put("operatingCorpId", keyprojectHiddenService.getCorpInfoIdByHiddenId(pd));
map.put("dockData", JSON.toJSONString(pd));
return map;
}
}

View File

@ -0,0 +1,277 @@
package com.zcloud.controller.keyProjects.app;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.service.keyProjects.KeyprojectCheckService;
import com.zcloud.service.keyProjects.KeyprojectHiddenService;
import com.zcloud.service.keyProjects.KeyprojectPunishService;
import com.zcloud.service.relatedparty.OutSourcedService;
import com.zcloud.service.specialoperation.PersonnelManagementService;
import com.zcloud.service.system.ImgFilesService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
* luoxiaobao
* 2022-09-21
* www.zcloudchina.com
*/
@Controller
@RequestMapping("/app/keyprojectpunish")
public class AppKeyprojectPunishController extends BaseController {
@Autowired
private KeyprojectPunishService keyprojectpunishService;
@Autowired
private KeyprojectHiddenService keyprojectHiddenService;
@Autowired
private ImgFilesService imgFilesService;
@Autowired
private Smb smb;
@Autowired
private OutSourcedService outsourcedService;
@Autowired
private KeyprojectCheckService keyprojectcheckService;
@Autowired
private PersonnelManagementService personnelmanagementService;
/**
* @param
* @throws Exception
*/
@RequestMapping(value="/handle")
@ResponseBody
@Transactional
public Object handle(@RequestParam(value="FFILE",required=false) MultipartFile[] files) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("HANDLED", 1);
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
String suffixName = files[i].getOriginalFilename().substring(files[i].getOriginalFilename().lastIndexOf(".")+1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
map.put("result", "fail");
map.put("exception", "上传文件格式不正确");
return map;
}
}
for (int i = 0; i < files.length; i++) {
MultipartFile file = files[i];
String ffile = DateUtil.getDays();
// String filePath = PathUtil.getProjectpath() + Const.FILEPATHFILE + ffile; //文件上传路径
// String fileName = FileUpload.fileUp(file, filePath, this.get32UUID()); //执行上传
String fileName = this.get32UUID()+file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file, fileName, Const.FILEPATHFILE + ffile);
pd.put("HANDLE_IMG", Const.FILEPATHFILE + ffile + "/" + fileName);
}
}
keyprojectpunishService.editstate(pd);
map.put("result", errInfo);
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/add")
@ResponseBody
public Object add() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
PageData hidden = keyprojectHiddenService.findById(pd);
pd.put("KEYPROJECTPUNISH_ID", this.get32UUID()); //主键
pd.put("CREATTIME", DateUtil.date2Str(new Date())); //添加时间
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", 0); //是否删除
pd.put("HANDLED", 0);
pd.put("HIDDEN_ID", hidden.get("HIDDEN_ID"));
pd.put("KEYPROJECTCHECK_ID", hidden.get("FOREIGN_ID"));
pd.put("UNITS_ID", hidden.get("RECTIFICATIONDEPT"));
pd.put("PERSONNELMANAGEMENT_ID", hidden.get("RECTIFICATIONOR"));
keyprojectpunishService.save(pd);
//因发送其他项目需要 提出来
PageData keyprote = new PageData();
keyprote.put("KEYPROJECTCHECK_ID", pd.getString("KEYPROJECTCHECK_ID"));
keyprote = keyprojectcheckService.findById(keyprote);
//发送处罚短信通知
try {
//这里发送短信 判断公司是否需要发送短信 然后判断是否有隐患 有则发送 没有不发送
PageData outSource = new PageData();
outSource.put("OUTSOURCED_ID", keyprote.getString("OUTSOURCED_ID"));
outSource = outsourcedService.findById(outSource);
if (StringUtils.isNotBlank(outSource.getString("IS_SMS")) && StringUtils.equals("0", outSource.getString("IS_SMS"))) {
//发送短信 pd中 PERSONNELMANAGEMENT_ID 对应 `qa-gwj-regulatory`.`BUS_PERSONNELMANAGEMENT` 表中 PERSONNELMANAGEMENT_ID 获取到 PHONENUM 手机号字段 发送短信
PageData person = new PageData();
person.put("PERSONNELMANAGEMENT_ID", pd.getString("PERSONNELMANAGEMENT_ID"));
person = personnelmanagementService.findById(person);
// outSource.get("OUTSOURCED_NAME")
JSONArray jsonArray = new JSONArray();
//接受返回结果
JSONObject records = new JSONObject();
//定义替换参数
JSONObject tpContent = new JSONObject();
tpContent.put("REASON", pd.getString("REASON"));
records = SendSmsUtil.getRecords(person.getString("PHONENUM"), tpContent);
jsonArray.add(records);
SendSmsUtil.sendSms("121490", jsonArray, null);
}
} catch (Exception e) {
e.printStackTrace();
} finally {
//获取当前重点工程的所属企业 根据重点工程创建人获取
PageData dataDock = new PageData();
String corpInfoId = outsourcedService.getCorpInfoByOutsourcesCreator(pd);
pd.put("operatingCorpId", corpInfoId);
dataDock.putAll(pd);
map.put("dockData", JSON.toJSONString(dataDock));
map.put("result", errInfo);
}
return map;
}
/**
* @param
* @throws Exception
*/
@RequestMapping(value="/delete")
@ResponseBody
public Object delete() throws Exception{
Map<String,String> map = new HashMap<String,String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
keyprojectpunishService.delete(pd);
map.put("result", errInfo); //返回结果
return map;
}
/**
* @param
* @throws Exception
*/
@RequestMapping(value="/edit")
@ResponseBody
public Object edit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
keyprojectpunishService.edit(pd);
map.put("result", errInfo);
return map;
}
/**
* @param page
* @throws Exception
*/
@RequestMapping(value="/list")
@ResponseBody
public Object list(Page page) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
page.setPd(pd);
List<PageData> varList = keyprojectpunishService.list(page); //列出KeyprojectPunish列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**
* @param
* @throws Exception
*/
@RequestMapping(value="/goEdit")
@ResponseBody
public Object goEdit() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = keyprojectpunishService.findById(pd); //根据ID读取
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**
* @param
* @throws Exception
*/
@RequestMapping(value="/deleteAll")
@ResponseBody
public Object deleteAll() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
String DATA_IDS = pd.getString("DATA_IDS");
if(Tools.notEmpty(DATA_IDS)){
String ArrayDATA_IDS[] = DATA_IDS.split(",");
keyprojectpunishService.deleteAll(ArrayDATA_IDS);
errInfo = "success";
}else{
errInfo = "error";
}
map.put("result", errInfo); //返回结果
return map;
}
// /**重点工程处罚列表 包含 未选择处罚结果的隐患 已下发处罚但为反馈的隐患 不处罚的隐患
// * @param page
// * @throws Exception
// */
// @RequestMapping(value="/punishlist")
// @ResponseBody
// public Object punishlist(Page page) throws Exception{
// Map<String,Object> map = new HashMap<String,Object>();
// String errInfo = "success";
// PageData pd = new PageData();
// pd = this.getPageData();
// String KEYWORDS = pd.getString("KEYWORDS"); //关键词检索条件
// if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
// page.setPd(pd);
// List<PageData> varList = keyprojectpunishService.getpunishlist(page); //列出KeyprojectCheck列表
// map.put("varList", varList);
// map.put("page", page);
// map.put("result", errInfo);
// return map;
// }
}

View File

@ -5,7 +5,13 @@ import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.logs.LogAnno;
import com.zcloud.service.relatedparty.OutSourcedService;
import com.zcloud.service.system.DepartmentService;
import com.zcloud.service.system.ImgFilesService;
import com.zcloud.service.system.UsersService;
import com.zcloud.service.video.AIWarningService;
import com.zcloud.service.video.VideoManagerService;
import com.zcloud.util.*;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -31,6 +37,100 @@ public class OutSourcedController extends BaseController {
private OutSourcedService outsourcedService;
@Autowired
private Smb smb;
@Autowired
private AIWarningService aiWarningService;
@Autowired
private DepartmentService departmentService;
@Autowired
private UsersService usersService;
@Autowired
private ImgFilesService imgfilesService;
@Autowired
private VideoManagerService videoManagerService;
@RequestMapping(value = "/start")
@ResponseBody
public Object start() throws Exception {
Map<String, String> map = new HashMap<String, String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd = outsourcedService.findById(pd);
if (!StringUtils.isNotBlank(pd.getString("WORK_LONGITUDE"))){
map.put("result", errInfo);
map.put("message","工程未定位!");
map.put("code","500");
return map;
}
outsourcedService.start(pd);
map.put("code","0");
map.put("result", errInfo); //返回结果
return map;
}
/**
*
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/jie")
@ResponseBody
public Object jie() throws Exception {
Map<String, String> map = new HashMap<String, String>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
//校验当前重点工程是否存在未完成的隐患 包含未整改未处罚ai报警未处置的
PageData pageData = outsourcedService.jieshuOutSourced(pd);
if(!StringUtils.equals("0",pageData.getString("qr"))){
map.put("result", errInfo);
map.put("message","当前重点工程还有"+pageData.getString("qr")+"项待确认安全环保检查,请处理以后再结束");
map.put("code","500");
return map;
}
if(!StringUtils.equals("0",pageData.getString("zg"))){
map.put("result", errInfo);
map.put("message","当前重点工程还有"+pageData.getString("zg")+"项需整改的隐患,请处理以后再结束");
map.put("code","500");
return map;
}
if(!StringUtils.equals("0",pageData.getString("ys"))){
map.put("result", errInfo);
map.put("message","当前重点工程还有"+pageData.getString("ys")+"项待验收隐患,请处理以后再结束");
map.put("code","500");
return map;
}
if(!StringUtils.equals("0",pageData.getString("cf"))){
map.put("result", errInfo);
map.put("message","当前重点工程还有"+pageData.getString("cf")+"项待处罚隐患,请处理以后再结束");
map.put("code","500");
return map;
}
if(!StringUtils.equals("0",pageData.getString("fk"))){
map.put("result", errInfo);
map.put("message","当前重点工程还有"+pageData.getString("fk")+"项处罚待反馈隐患,请处理以后再结束");
map.put("code","500");
return map;
}
if(!StringUtils.equals("0",pageData.getString("ai"))){
map.put("result", errInfo);
map.put("message","当前重点工程还有"+pageData.getString("ai")+"项AI报警待处置,请处理以后再结束");
map.put("code","500");
return map;
}
pd = outsourcedService.findById(pd);
outsourcedService.jie(pd);
//清空摄像头与重点工程的关联关系
videoManagerService.updateAiByOUTSOURCED_ID(pd);
map.put("code","0");
map.put("result", errInfo); //返回结果
return map;
}
/**
* @param
* @throws Exception
@ -128,7 +228,7 @@ public class OutSourcedController extends BaseController {
}
/**
* @param out
* @param
* @throws Exception
*/
@RequestMapping(value="/delete")
@ -161,7 +261,8 @@ public class OutSourcedController extends BaseController {
@RequestParam(value="file5",required=false) MultipartFile file5,
@RequestParam(value="file6",required=false) MultipartFile file6,
@RequestParam(value="file7",required=false) MultipartFile file7,
@RequestParam(value="file8",required=false) MultipartFile file8 ) throws Exception{
@RequestParam(value="file8",required=false) MultipartFile file8,
@RequestParam(value= "file9", required = false) MultipartFile[] file9) throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
@ -229,6 +330,36 @@ public class OutSourcedController extends BaseController {
pd.put("OATTACHMENTS", file8.getOriginalFilename());
pd.put("OATTACHMENTSPATH", Const.FILEPATHFXGFGL + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
}
if (null != file9 && file9.length > 0) {
//校验
for (int i = 0; i < file9.length; i++) {
MultipartFile file9One = file9[i];
String suffixName = file9One.getOriginalFilename().substring(file9One.getOriginalFilename().lastIndexOf(".") + 1).toLowerCase();
if (!"pdf".equals(suffixName) && !"jpg".equals(suffixName) && !"jpeg".equals(suffixName) && !"png".equals(suffixName) && !"mp4".equals(suffixName)) {
map.put("result", "fail");
map.put("exception", "上传文件格式不正确");
return map;
}
}
for (int i = 0; i < file9.length; i++) {
MultipartFile file9One = file9[i];
String ffile = DateUtil.getDays();
String fileName = this.get32UUID() + file9One.getOriginalFilename().
substring(file9One.getOriginalFilename().lastIndexOf("."));
smb.sshSftp(file9One, fileName, Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile);
PageData pdImg = new PageData();
String fileUpdateName = file9One.getOriginalFilename();
pdImg.put("IMGFILES_ID", this.get32UUID());
pdImg.put("FILE_NAME", fileUpdateName);
pdImg.put("FILEPATH", Const.FILEPATHYHTP + Jurisdiction.getCORPINFO_ID() + "/" + ffile + "/" + fileName);
pdImg.put("TYPE", "300");
pdImg.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID"));
imgfilesService.save(pdImg);
}
}
outsourcedService.edit(pd);
map.put("result", errInfo);
return map;
@ -272,7 +403,26 @@ public class OutSourcedController extends BaseController {
PageData pd = new PageData();
pd = this.getPageData();
pd = outsourcedService.findById(pd); //根据ID读取
PageData selectPageData = new PageData();
selectPageData.put("CORPINFO_ID", pd.get("PUNISH_THE_PERSON"));
List<PageData> deptList = departmentService.listAll(selectPageData); //根据ID读取
String userStr = pd.getString("PUNISH_THE_PERSON");
if (!Tools.isEmpty(userStr)) {
String[] split = userStr.split(",");
selectPageData.put("ids", split);
// List<PageData> pageData = usersService.listUserAndDept(selectPageData);
// 监管与企业的
List<PageData> pageData = usersService.selectUserListByUserIds(selectPageData);
map.put("punishThePerson", pageData);
}
PageData pd3 = new PageData();
pd3.put("TYPE", 300);
pd3.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID"));
List<PageData> file9 = imgfilesService.listAll(pd3);
map.put("pd", pd);
map.put("deptList", deptList);
map.put("file9", file9);
map.put("result", errInfo);
return map;
}

View File

@ -49,6 +49,7 @@ public class PersonnelManagementController extends BaseController {
pd.put("OPERATTIME", DateUtil.date2Str(new Date())); //修改时间
pd.put("ISDELETE", "0"); //是否删除
pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); //企业ID
pd.put("PASSWORD", new SimpleHash("SHA-1", pd.getString("PHONENUM"), Const.DEFAULT_PASSWORD).toString());
personnelmanagementService.save(pd);
map.put("result", errInfo);
return map;

View File

@ -18,5 +18,11 @@ public interface CommonMapper {
* @throws Exception
*/
List<PageData> datalistPage(Page page);
/**
* @param pd
* @throws Exception
*/
void edit(PageData pd);
}

View File

@ -1,5 +1,6 @@
package com.zcloud.mapper.datasource.hiddenDangerCheckStandard;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
@ -17,5 +18,55 @@ public interface StandardDictionaryMapper {
* @throws Exception
*/
List<PageData> list(PageData pd);
/**
* @param pd
* @throws Exception
*/
void save(PageData pd);
/**
* @param pd
* @throws Exception
*/
void delete(PageData pd);
/**
* @param pd
* @throws Exception
*/
void edit(PageData pd);
/**
* @param page
* @throws Exception
*/
List<PageData> datalistPage(Page page);
/**()
* @param pd
* @throws Exception
*/
List<PageData> listAll(PageData pd);
/**id
* @param pd
* @throws Exception
*/
PageData findById(PageData pd);
/**
* @param pd
* @throws Exception
*/
void deleteAll(PageData pd);
Integer getCount(PageData pd);
/**()
* @param pd
* @throws Exception
*/
List<PageData> listSelect(PageData pd);
}

View File

@ -55,5 +55,12 @@ public interface KeyprojectCheckMapper {
*/
void deleteAll(String[] ArrayDATA_IDS);
void confirm(PageData pd);
/** ()
* @param pd
* @throws Exception
*/
List<PageData> getSmsList(PageData pd);
}

View File

@ -89,29 +89,6 @@ public interface KeyprojectHiddenMapper {
*/
List<PageData> listExcelHidden(PageData pd);
/**
* @param page
* @throws Exception
*/
List<PageData> generalHiddenlistPage(Page page);
/**
* @param page
* @throws Exception
*/
List<PageData> ignoreHiddenlistPage(Page page);
/**
* @param page
* @throws Exception
*/
List<PageData> majorhiddenlistPage(Page page);
/**ID
* @param page
* @throws Exception
*/
List<PageData> specialByIdlistPage(Page page);
void editstate(PageData pd);
@ -158,5 +135,31 @@ public interface KeyprojectHiddenMapper {
*/
List<PageData> getpunishlistPage(Page page);
/** ()
* @param pd
* @throws Exception
*/
List<PageData> getSmsList(PageData pd);
/**
*
* @param pd
* @return
*/
String getPUNISHTHEPERSON(PageData pd);
List<String> getPhone(PageData pd);
List<PageData> hiddenlistPage(Page page);
/**
*
* @param pd
* @return
*/
String getCorpInfoIdByHiddenId(PageData pd);
List<PageData> specialByIdlistPage(Page page);
}

View File

@ -0,0 +1,59 @@
package com.zcloud.mapper.datasource.keyProjects;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
/**
*
* luoxiaobao
* 2023-07-21
* www.zcloudchina.com
*/
public interface PlatformvideomanagementMapper {
/**
* @param pd
* @throws Exception
*/
void save(PageData pd);
/**
* @param pd
* @throws Exception
*/
void delete(PageData pd);
/**
* @param pd
* @throws Exception
*/
void edit(PageData pd);
/**
* @param page
* @throws Exception
*/
List<PageData> datalistPage(Page page);
/**()
* @param pd
* @throws Exception
*/
List<PageData> listAll(PageData pd);
/**id
* @param pd
* @throws Exception
*/
PageData findById(PageData pd);
/**
* @param ArrayDATA_IDS
* @throws Exception
*/
void deleteAll(String[] ArrayDATA_IDS);
}

View File

@ -55,5 +55,34 @@ public interface OutSourcedMapper{
*/
void deleteAll(String[] ArrayDATA_IDS);
/**id
* @param pd
* @throws Exception
*/
PageData homepagedata(PageData pd);
String getDeptId(String userId);
String getCorpInfoByOutsourcesCreator(PageData pd);
/**
* APP
* @param page
* @return
*/
List<PageData> applylistPage(Page page);
void editDingWei(PageData pd);
//校验结束重点工程是否有为完成的内容
PageData jieshuOutSourced(PageData pd);
/**
* @param pd
* @throws Exception
*/
void jie(PageData pd);
void start(PageData pd);
}

View File

@ -64,5 +64,7 @@ public interface PersonnelManagementMapper{
PageData findByCertificate(PageData pd);
void editPassword(PageData pd);
PageData findForLogin(PageData pd);
}

View File

@ -256,5 +256,7 @@ public interface UsersMapper {
List<PageData> getUserCardNoAll(PageData departPd);
List<PageData> selectUserListByUserIds(PageData pd);
PageData getUserByCardNo(PageData pageData);
}

View File

@ -67,6 +67,10 @@ public interface VideoManagerMapper {
PageData findByCode(PageData videoPd);
List<PageData> dataApplistPage(Page page);
void updateAiByOUTSOURCED_ID(PageData pd);
List<PageData> getCameraAlarmCount(PageData pageData);
List<PageData> getCameraAlarmTypeCount(PageData pageData);

View File

@ -19,5 +19,10 @@ public interface CommonService {
*/
public List<PageData> list(Page page)throws Exception;
/**
* @param pd
* @throws Exception
*/
void edit(PageData pd)throws Exception;
}

View File

@ -107,5 +107,6 @@ public interface CustomService {
List<PageData> getListByCorplistPage(Page page)throws Exception;
}

View File

@ -1,5 +1,6 @@
package com.zcloud.service.hiddenDangerCheckStandard;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
@ -17,5 +18,65 @@ public interface StandardDictionaryService {
* @throws Exception
*/
List<PageData> list(PageData pd)throws Exception;
/**
* @param pd
* @throws Exception
*/
void save(PageData pd)throws Exception;
/**
* @param pd
* @throws Exception
*/
void delete(PageData pd)throws Exception;
/**
* @param pd
* @throws Exception
*/
void edit(PageData pd)throws Exception;
/**
* @param page
* @throws Exception
*/
List<PageData> list(Page page)throws Exception;
/**()
* @param pd
* @throws Exception
*/
List<PageData> listTree(PageData pd)throws Exception;
/**()
* @param pd
* @throws Exception
*/
List<PageData> listAll(PageData pd)throws Exception;
/**id
* @param pd
* @throws Exception
*/
PageData findById(PageData pd)throws Exception;
/**
* @param pd
* @throws Exception
*/
void deleteAll(PageData pd)throws Exception;
/**id
* @param pd
* @throws Exception
*/
Integer getCount(PageData pd)throws Exception;
/**()
* @param pd
* @throws Exception
*/
List<PageData> listSelect(PageData pd)throws Exception;
}

View File

@ -30,6 +30,17 @@ public class CommonServiceImpl implements CommonService {
public List<PageData> list(Page page)throws Exception{
return commonMapper.datalistPage(page);
}
/**
*
*
* @param pd
* @throws Exception
*/
@Override
public void edit(PageData pd) throws Exception {
commonMapper.edit(pd);
}
}

View File

@ -80,13 +80,6 @@ public class CustomServiceImpl implements CustomService {
customMapper.enable(pd);
}
/**
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception{
customMapper.edit(pd);
}
public List<PageData> stoplist(Page page)throws Exception{
return customMapper.stopdatalistPage(page);
@ -147,7 +140,13 @@ public class CustomServiceImpl implements CustomService {
return customMapper.getListByCorplistPage(page);
}
/**
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception{
customMapper.edit(pd);
}
}

View File

@ -1,5 +1,6 @@
package com.zcloud.service.hiddenDangerCheckStandard.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.hiddenDangerCheckStandard.StandardDictionaryMapper;
import com.zcloud.service.hiddenDangerCheckStandard.StandardDictionaryService;
@ -7,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.*;
/**
*
@ -29,6 +30,134 @@ public class StandardDictionaryServiceImpl implements StandardDictionaryService
public List<PageData> list(PageData pd)throws Exception{
return dictionaryMapper.list(pd);
}
/**
*
*
* @param pd
* @throws Exception
*/
public void save(PageData pd) throws Exception {
dictionaryMapper.save(pd);
}
/**
*
*
* @param pd
* @throws Exception
*/
public void delete(PageData pd) throws Exception {
dictionaryMapper.delete(pd);
}
/**
*
*
* @param pd
* @throws Exception
*/
public void edit(PageData pd) throws Exception {
dictionaryMapper.edit(pd);
}
/**
*
*
* @param page
* @throws Exception
*/
public List<PageData> list(Page page) throws Exception {
return dictionaryMapper.datalistPage(page);
}
/**()
* @param pd
* @throws Exception
*/
public List<PageData> listTree(PageData pd)throws Exception {
List<PageData> list = new ArrayList<>();
List<PageData> listAll = dictionaryMapper.listAll(pd);
Map<String, PageData> map = new HashMap<>();
for (PageData r : listAll) {
map.put(r.getString("DICTIONARY_ID"), r);
}
Iterator<Map.Entry<String, PageData>> it = map.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<String, PageData> entry = it.next();
PageData root = entry.getValue();
if ("0".equals(root.getString("PARENT_ID"))) {
root.put("PARENT_NAME", "(无)");
list.add(entry.getValue());
it.remove();//使用迭代器的remove()方法删除元素
}
}
list.sort((x, y) -> Integer.compare(Integer.parseInt(x.get("DICTIONARY_SORT").toString()), Integer.parseInt(y.get("DICTIONARY_SORT").toString())));
TreeAppendChildren(map, list);
return list;
}
private void TreeAppendChildren(Map<String, PageData> map, List<PageData> list) {
if (!map.isEmpty()) {
for (PageData parent : list) {
List<PageData> children = new ArrayList<PageData>();
Iterator<Map.Entry<String, PageData>> it = map.entrySet().iterator();
while (it.hasNext()) {
Map.Entry<String, PageData> entry = it.next();
PageData child = entry.getValue();
if (parent.getString("DICTIONARY_ID").equals(child.getString("PARENT_ID"))) {
children.add(child);
it.remove();//使用迭代器的remove()方法删除元素
}
}
if (children.size() > 0) {
children.sort((x, y) -> Integer.compare(Integer.parseInt(x.get("DICTIONARY_SORT").toString()), Integer.parseInt(y.get("DICTIONARY_SORT").toString())));
parent.put("children", children);
TreeAppendChildren(map, children);
}
}
}
}
/**
* ()
*
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd) throws Exception {
return dictionaryMapper.listAll(pd);
}
/**
* id
*
* @param pd
* @throws Exception
*/
public PageData findById(PageData pd) throws Exception {
return dictionaryMapper.findById(pd);
}
/**
*
*
* @param pd
* @throws Exception
*/
public void deleteAll(PageData pd) throws Exception {
dictionaryMapper.deleteAll(pd);
}
@Override
public Integer getCount(PageData pd) throws Exception {
return dictionaryMapper.getCount(pd);
}
@Override
public List<PageData> listSelect(PageData pd)throws Exception{
return dictionaryMapper.listSelect(pd);
}
}

View File

@ -55,5 +55,13 @@ public interface KeyprojectCheckService{
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
public void confirm(PageData pd)throws Exception;
/** ()
* @param pd
* @throws Exception
*/
List<PageData> getSmsList(PageData pd);
}

View File

@ -88,20 +88,20 @@ public interface KeyprojectHiddenService {
*/
public PageData yhpcCountForApp(PageData pd) throws Exception;
/**
*
* @param pd
* @return
* @throws Exception
*/
public List<PageData> getOtherHidden(PageData pd) throws Exception;
/**
*
* @param pd
* @return
* @throws Exception
*/
public List<PageData> getOtherHidden(PageData pd) throws Exception;
public List<PageData> getListForApp(Page page) throws Exception;
public List<PageData> getListForApp(Page page) throws Exception;
public List<PageData> mainStatistics(PageData pd) throws Exception;
public List<PageData> mainStatisticsForApp(PageData pd) throws Exception;
public List<PageData> mainStatisticsForApp(PageData pd) throws Exception;
/**EXCEL使
* @param pd
@ -109,17 +109,6 @@ public interface KeyprojectHiddenService {
*/
public List<PageData> listExcelHidden(PageData pd)throws Exception;
/**
* @param page
* @throws Exception
*/
public List<PageData> generalHiddenlistPage(Page page)throws Exception;
/**
* @param page
* @throws Exception
*/
public List<PageData> ignoreHiddenlistPage(Page page)throws Exception;
/**
* --
@ -127,7 +116,7 @@ public interface KeyprojectHiddenService {
* @return
* @throws Exception
*/
List<PageData> verifylist(Page page) throws Exception;
List<PageData> verifylist(Page page) throws Exception;
/**
*
@ -149,7 +138,7 @@ public interface KeyprojectHiddenService {
* @return
* @throws Exception
*/
List<PageData> checkandaccept(Page page) throws Exception;
List<PageData> checkandaccept(Page page) throws Exception;
/**
* @param page
@ -169,7 +158,8 @@ public interface KeyprojectHiddenService {
void changeState(PageData hidden) throws Exception;
void deleteByKey(PageData key) throws Exception;
void deleteByKey(PageData key) throws Exception;
/**
*
@ -179,6 +169,28 @@ public interface KeyprojectHiddenService {
*/
public PageData keyprojectcount(PageData pd)throws Exception;
List<PageData> getpunishlist(Page page);
/** ()
* @param pd
* @throws Exception
*/
List<PageData> getSmsList(PageData pd);
/**
*
* @param pd
* @return
*/
String getPUNISHTHEPERSON(PageData pd);
List<String> getPhone(PageData pd);
List<PageData> hiddenList(Page page);
/**
*
* @param pd
* @return
*/
String getCorpInfoIdByHiddenId(PageData pd);
}

View File

@ -79,5 +79,14 @@ public class KeyprojectCheckServiceImpl implements KeyprojectCheckService {
keyprojectcheckMapper.deleteAll(ArrayDATA_IDS);
}
public void confirm(PageData pd)throws Exception{
keyprojectcheckMapper.confirm(pd);
}
@Override
public List<PageData> getSmsList(PageData pd) {
return keyprojectcheckMapper.getSmsList(pd);
}
}

View File

@ -155,15 +155,6 @@ public class KeyprojectHiddenServiceImpl implements KeyprojectHiddenService {
return hiddenMapper.listExcelHidden(pd);
}
@Override
public List<PageData> generalHiddenlistPage(Page page) throws Exception {
return hiddenMapper.generalHiddenlistPage(page);
}
@Override
public List<PageData> ignoreHiddenlistPage(Page page) throws Exception {
return hiddenMapper.ignoreHiddenlistPage(page);
}
@Override
public List<PageData> verifylist(Page page) throws Exception {
@ -245,9 +236,33 @@ public class KeyprojectHiddenServiceImpl implements KeyprojectHiddenService {
return hiddenMapper.keyprojectcount(pd);
}
@Override
public List<PageData> getpunishlist(Page page) {
return hiddenMapper.getpunishlistPage(page);
}
@Override
public List<PageData> getSmsList(PageData pd) {
return hiddenMapper.getSmsList(pd);
}
@Override
public String getPUNISHTHEPERSON(PageData pd) {
return hiddenMapper.getPUNISHTHEPERSON(pd);
}
@Override
public List<String> getPhone(PageData pd) {
return hiddenMapper.getPhone(pd);
}
@Override
public List<PageData> hiddenList(Page page) {
return hiddenMapper.hiddenlistPage(page);
}
@Override
public String getCorpInfoIdByHiddenId(PageData pd) {
return hiddenMapper.getCorpInfoIdByHiddenId(pd);
}
}

View File

@ -5,7 +5,7 @@ import com.zcloud.entity.PageData;
import java.util.List;
/**
/**
*
* luoxiaobao
* 2022-06-14
@ -18,42 +18,71 @@ public interface OutSourcedService{
* @throws Exception
*/
public void save(PageData pd)throws Exception;
/**
* @param pd
* @throws Exception
*/
public void delete(PageData pd)throws Exception;
/**
* @param pd
* @throws Exception
*/
public void edit(PageData pd)throws Exception;
/**
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception;
/**()
* @param pd
* @throws Exception
*/
public List<PageData> listAll(PageData pd)throws Exception;
/**id
* @param pd
* @throws Exception
*/
public PageData findById(PageData pd)throws Exception;
/**
* @param ArrayDATA_IDS
* @throws Exception
*/
public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
/**id
* @param pd
* @throws Exception
*/
public PageData homepagedata(PageData pd)throws Exception;
String getDeptId(String userId);
String getCorpInfoByOutsourcesCreator(PageData pd);
/**
* APP
* @param page
* @return
*/
List<PageData> applylist(Page page);
void editDingWei(PageData pd)throws Exception;
//校验结束重点工程是否有为完成的内容
PageData jieshuOutSourced(PageData pd);
/**
* @param pd
* @throws Exception
*/
public void jie(PageData pd)throws Exception;
void start(PageData pd);
}

View File

@ -79,5 +79,54 @@ public class OutSourcedServiceImpl implements OutSourcedService{
outsourcedMapper.deleteAll(ArrayDATA_IDS);
}
/**id
* @param pd
* @throws Exception
*/
public PageData homepagedata(PageData pd)throws Exception{
return outsourcedMapper.homepagedata(pd);
}
public String getDeptId(String userId) {
return outsourcedMapper.getDeptId(userId);
}
@Override
public String getCorpInfoByOutsourcesCreator(PageData pd) {
return outsourcedMapper.getCorpInfoByOutsourcesCreator(pd);
}
@Override
public List<PageData> applylist(Page page) {
return outsourcedMapper.applylistPage(page);
}
/**
* @param pd
* @throws Exception
*/
public void editDingWei(PageData pd)throws Exception{
outsourcedMapper.editDingWei(pd);
}
@Override
public PageData jieshuOutSourced(PageData pd) {
return outsourcedMapper.jieshuOutSourced(pd);
}
/**
* @param pd
* @throws Exception
*/
public void jie(PageData pd)throws Exception{
outsourcedMapper.jie(pd);
}
@Override
public void start(PageData pd) {
outsourcedMapper.start(pd);
}
}

View File

@ -65,5 +65,6 @@ public interface PersonnelManagementService{
void editPassword(PageData updateUser) throws Exception;
PageData findForLogin(PageData pd);
}

View File

@ -101,5 +101,9 @@ public class PersonnelManagementServiceImpl implements PersonnelManagementServic
personnelmanagementMapper.editPassword(pd);
}
public PageData findForLogin(PageData pd){
return personnelmanagementMapper.findForLogin(pd);
}
}

View File

@ -293,6 +293,8 @@ public interface UsersService {
List<PageData> getUserCardNoAll(PageData departPd);
List<PageData> selectUserListByUserIds(PageData selectPageData);
/**
* @Description: id
* @Author: dearLin

View File

@ -613,4 +613,11 @@ public class UsersServiceImpl implements UsersService {
return usersMapper.listUserlistPage(page);
}
@Override
public List<PageData> selectUserListByUserIds(PageData pd) {
return usersMapper.selectUserListByUserIds(pd);
}
}

View File

@ -68,6 +68,10 @@ public interface VideoManagerService {
PageData findByCode(PageData videoPd);
List<PageData> listApp(Page page);
void updateAiByOUTSOURCED_ID(PageData pd);
List<PageData> getCameraAlarmCount(PageData pageData);
List<PageData> getCameraAlarmTypeCount(PageData pageData);

View File

@ -213,5 +213,15 @@ public class VideoManagerServiceImpl implements VideoManagerService {
return collect;
}
@Override
public List<PageData> listApp(Page page) {
return videomanagerMapper.dataApplistPage(page);
}
@Override
public void updateAiByOUTSOURCED_ID(PageData pd) {
videomanagerMapper.updateAiByOUTSOURCED_ID(pd);
}
}

View File

@ -0,0 +1,116 @@
package com.zcloud.util;
import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.http.MediaType;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import static org.bouncycastle.asn1.x500.style.RFC4519Style.cn;
/**
*
*/
public class SendSmsUtil {
private static String USERNAME = "qhdzyhy";
private static String PASSWORD = "3ba40593f514f0c1ebdfc278dddfc9ce";
private static String SIGNATURE = "【秦港双控】";
private static String URL = "https://api.mix2.zthysms.com/v2/sendSmsTp";
/**
*
* @param records
* @param time
* records records JSONArray getRecords JSONObject JSONArray put
* "records":[
* {
* "mobile":"138****0000",
* "tpContent":{
* "var1":"变量1",
* "var2":"变量2"
* }
* },
* {
* "mobile":"138****0001",
* "tpContent":{
* "var1":"变量2",
* "var2":"变量2"
* }
* }
* ]
*/
public static void sendSms(String tpId,JSONArray records ,String time) throws ParseException {
JSONObject json = new JSONObject();
Long tKey = System.currentTimeMillis()/1000;
String passWord = MD5.md5(PASSWORD+tKey);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//扔参数
json.put("username",USERNAME);
json.put("password",passWord);
json.put("tKey",tKey);
json.put("signature",SIGNATURE);
json.put("tpId",tpId);
if(StringUtils.isNotBlank(time)){
if(sdf.parse(time).after(new Date())){
json.put("time",time);
}
}
json.put("records",records);
System.out.println(json.toJSONString());
String result = HttpRequest.post(URL)
.timeout(60000)
.body(json.toJSONString(), MediaType.APPLICATION_JSON_UTF8_VALUE).execute().body();
System.out.println(result);
}
/**
*
* @param mobile
* @param tpContent
* @return
* var1 1
* {
* "mobile":"138****0000",
* "tpContent":{
* "var1":"变量1",
* "var2":"变量2"
* }
* }
*/
public static JSONObject getRecords(String mobile, JSONObject tpContent ){
JSONObject json = new JSONObject();
json.put("mobile",mobile);
if(ObjectUtils.hashCode(tpContent)!=0){
json.put("tpContent",tpContent);
}
return json;
}//d22f8a5d4a35b3761dc9525186e652a0
//测试接口
public static void main(String[] args) throws ParseException {
JSONArray jsonArray = new JSONArray();
//接受返回结果
JSONObject records = new JSONObject();
//定义替换参数
JSONObject tpContent = new JSONObject();
tpContent.put("HIDDENDESCR","测试发送111--222-1");
records = getRecords("18617456701",tpContent);
jsonArray.add(records);
//sendSms("121487",jsonArray,null);
}
}

View File

@ -212,7 +212,8 @@
<select id="datalistPage" parameterType="page" resultType="pd">
select
f.LISTMANAGER_ID,
'1' LIST_TYPE,
f.LISTMANAGER_ID LIST_ID,
f.LIST_NAME,
f.CORPINFO_ID,
f.CREATOR,
@ -251,6 +252,12 @@
f.LISTMANAGER_ID = #{pd.LISTMANAGER_ID}
)
</if>
<if test="pd.CUSTOM_ID != null and pd.CUSTOM_ID != ''">
and
(
f.LISTMANAGER_ID = #{pd.CUSTOM_ID}
)
</if>
<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
and
(
@ -366,8 +373,182 @@
</choose>
</otherwise>
</choose>
order by IFNULL( f.CHECK_TIME, f.PERIODEND ) desc
UNION
SELECT
'2' LIST_TYPE,
f.CUSTOM_ID LIST_ID,
l.NAME LIST_NAME,
f.CORPINFO_ID,
f.CREATOR,
f.CREATTIME,
f.OPERATOR,
f.OPERATTIME,
f.ISDELETE,
f.LONGITUDE,
f.LATITUDE,
f.CHECKRECORD_ID,
f.CHECK_TIME,
f.DESCR,
f.FINISHED,
f.TYPE,
f.PERIODSTART DATESTART,
f.PERIODEND DATEEND,
u.NAME AS USER_NAME,
su.NAME AS PRINCIPALNAME,
(
SELECT
group_concat(
IFNULL( bh.USER_NAME, chr.NAME ))
FROM
BUS_CHECKUSER bh
LEFT JOIN sys_user chr ON chr.USER_ID = bh.USER_ID
WHERE
bh.CHECKRECORD_ID = f.CHECKRECORD_ID
) CHECK_USERS
FROM
bus_hiddendangercheckstandard_checkrecord f
LEFT JOIN SYS_USER u ON u.USERNAME = f.CREATOR
LEFT JOIN bus_hiddendangercheckstandard_custom l ON l.CUSTOM_ID = f.CUSTOM_ID
LEFT JOIN SYS_USER su ON su.USER_ID = l.USER_ID
WHERE
f.ISDELETE = '0'
and f.CORPINFO_ID = #{pd.CORPINFO_ID} and f.FINISHED='1'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''">
and
(
f.LIST_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
<if test="pd.CUSTOM_ID != null and pd.CUSTOM_ID != ''">
and
(
f.CUSTOM_ID = #{pd.CUSTOM_ID}
)
</if>
<if test="pd.LISTMANAGER_ID != null and pd.LISTMANAGER_ID != ''">
and
(
f.CUSTOM_ID = #{pd.LISTMANAGER_ID}
)
</if>
<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">
and
(
l.DEPARTMENT_ID = #{pd.DEPARTMENT_ID}
)
</if>
<!-- <if test="pd.STARTTIME != null and pd.STARTTIME != ''">
and DATE_FORMAT(f.CHECK_TIME,'%Y-%m-%d %H:%i:%s') &gt;= CONCAT(#{pd.STARTTIME},':00')
</if>
<if test="pd.ENDTIME != null and pd.ENDTIME != ''">
and DATE_FORMAT(f.CHECK_TIME,'%Y-%m-%d %H:%i:%s') &lt;= CONCAT(#{pd.ENDTIME},':59')
</if> -->
<choose>
<when test="pd.STARTTIME != null and pd.STARTTIME != '' and pd.ENDTIME != null and pd.ENDTIME != ''">
and DATE_FORMAT(CONCAT(#{pd.STARTTIME},' 00:00:00'),'%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(f.CREATTIME,'%Y-%m-%d %H:%i:%s')
and DATE_FORMAT(CONCAT(#{pd.ENDTIME},' 23:59:59'),'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(f.CREATTIME,'%Y-%m-%d %H:%i:%s')
</when>
<otherwise>
<if test="pd.STARTINSPECTTIME != null and pd.STARTINSPECTTIME != ''">
and DATE_FORMAT(CONCAT(#{pd.STARTINSPECTTIME},' 00:00:00'),'%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(f.PERIODEND,'%Y-%m-%d %H:%i:%s')
</if>
<if test="pd.ENDINSPECTTIME != null and pd.ENDINSPECTTIME != ''">
and DATE_FORMAT(CONCAT(#{pd.ENDINSPECTTIME},' 23:59:59'),'%Y-%m-%d %H:%i:%s') &gt;= DATE_FORMAT(f.PERIODSTART,'%Y-%m-%d %H:%i:%s')
</if>
</otherwise>
</choose>
<if test="pd.TYPE != null and pd.TYPE != ''">
and f.TYPE= #{pd.TYPE}
<!-- <choose>
<when test='pd.TYPE=="1"'>
order by IFNULL( f.CHECK_TIME, f.PERIODEND ) desc
</when>
<when test='pd.TYPE=="2"'>
order by IFNULL( f.CHECK_TIME, f.PERIODEND ) desc
</when>
</choose> -->
</if>
<choose>
<when test='pd.ISMAIN != null and pd.ISMAIN != "" and pd.ISMAIN == "1"'>
<if test="pd.DEPT_IDS != null and pd.DEPT_IDS != ''">
and
u.DEPARTMENT_ID in
<foreach item="item" index="index"
collection="pd.DEPT_IDS" open="(" separator="," close=")">
'${item}'
</foreach>
</if>
</when>
<otherwise>
<choose>
<when test='pd.ISSUPERVISE != null and pd.ISSUPERVISE != "" and pd.ISSUPERVISE == "1"'>
<choose>
<when test='pd.ISLEADER != null and pd.ISLEADER != "" and pd.ISLEADER == "1"'>
and
EXISTS (
SELECT
1
FROM
BUS_CHECKUSER bh
LEFT JOIN SYS_USER chr ON chr.USER_ID = bh.USER_ID
WHERE
bh.CHECKRECORD_ID = f.CHECKRECORD_ID
AND ((chr.DEPARTMENT_ID IN ( SELECT SUB_DEPARTMENT_ID FROM oa_supervision_department
osd WHERE osd.SUP_DEPARTMENT_ID = #{pd.SELF_DEPARTMENT_ID} AND osd.ISDELETE = '0' AND
osd.CORPINFO_ID = #{pd.CORPINFO_ID} ) )
or (chr.DEPARTMENT_ID IN
<foreach item="item" index="index"
collection="pd.DEPARTMENT_IDS" open="(" separator="," close=")">
'${item}'
</foreach>) )
)
</when>
<otherwise>
and
EXISTS (
SELECT
1
FROM
BUS_CHECKUSER bh
LEFT JOIN SYS_USER chr ON chr.USER_ID = bh.USER_ID
WHERE
(bh.CHECKRECORD_ID = f.CHECKRECORD_ID
or chr.USER_ID = #{pd.USER_ID})
AND chr.DEPARTMENT_ID IN ( SELECT SUB_DEPARTMENT_ID FROM oa_supervision_department osd WHERE osd.SUP_DEPARTMENT_ID = #{pd.SELF_DEPARTMENT_ID} AND osd.ISDELETE = '0' AND osd.CORPINFO_ID = #{pd.CORPINFO_ID} ) )
</otherwise>
</choose>
</when>
<when test='pd.ISLEADER != null and pd.ISLEADER != "" and pd.ISLEADER == "1"'>
and
EXISTS (
SELECT
1
FROM
BUS_CHECKUSER bh
LEFT JOIN SYS_USER chr ON chr.USER_ID = bh.USER_ID
WHERE
bh.CHECKRECORD_ID = f.CHECKRECORD_ID
AND chr.DEPARTMENT_ID IN
<foreach item="item" index="index"
collection="pd.DEPARTMENT_IDS" open="(" separator="," close=")">
'${item}'
</foreach> )
</when>
<when test="pd.SELF_DEPARTMENT_ID != null and pd.SELF_DEPARTMENT_ID != ''">
and l.DEPARTMENT_ID=#{pd.SELF_DEPARTMENT_ID}
and l.USER_ID = #{pd.USER_ID}
</when>
<otherwise>
</otherwise>
</choose>
</otherwise>
</choose>
ORDER BY IFNULL( CHECK_TIME,DATEEND) desc
</select>

View File

@ -112,4 +112,58 @@
</if>
order by bhci.CHECK_CATEGORY,bhci.CHECK_ITEM,bhci.COMMON_ITEM_SORT
</select>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
<if test="INDUSTRY_TYPE != null and INDUSTRY_TYPE != ''">
INDUSTRY_TYPE = #{INDUSTRY_TYPE},
</if>
<if test="INDUSTRY_TYPE_TREE != null and INDUSTRY_TYPE_TREE != ''">
INDUSTRY_TYPE_TREE = #{INDUSTRY_TYPE_TREE},
</if>
<if test="INDUSTRY_TYPE_NAMES != null and INDUSTRY_TYPE_NAMES != ''">
INDUSTRY_TYPE_NAMES = #{INDUSTRY_TYPE_NAMES},
</if>
<if test="CHECK_STANDARD_NAME != null and CHECK_STANDARD_NAME != ''">
CHECK_STANDARD_NAME = #{CHECK_STANDARD_NAME},
</if>
<if test="COMMON_STATUS != null and COMMON_STATUS != ''">
COMMON_STATUS = #{COMMON_STATUS},
</if>
<if test="ISDELETE != null and ISDELETE != ''">
ISDELETE = #{ISDELETE},
</if>
<if test="CREATOR_ID != null and CREATOR_ID != ''">
CREATOR_ID = #{CREATOR_ID},
</if>
<if test="CREATOR_NAME != null and CREATOR_NAME != ''">
CREATOR_NAME = #{CREATOR_NAME},
</if>
<if test="CREATE_TIME != null and CREATE_TIME != ''">
CREATE_TIME = #{CREATE_TIME},
</if>
<if test="OPERATOR_ID != null and OPERATOR_ID != ''">
OPERATOR_ID = #{OPERATOR_ID},
</if>
<if test="OPERATOR_NAME != null and OPERATOR_NAME != ''">
OPERATOR_NAME = #{OPERATOR_NAME},
</if>
<if test="OPERATE_TIME != null and OPERATE_TIME != ''">
OPERATE_TIME = #{OPERATE_TIME},
</if>
<if test="DELETEOR_ID != null and DELETEOR_ID != ''">
DELETEOR_ID = #{DELETEOR_ID},
</if>
<if test="DELETEOR_NAME != null and DELETEOR_NAME != ''">
DELETEOR_NAME = #{DELETEOR_NAME},
</if>
<if test="DELETE_TIME != null and DELETE_TIME != ''">
DELETE_TIME = #{DELETE_TIME},
</if>
COMMON_ID = COMMON_ID
where
COMMON_ID = #{COMMON_ID}
</update>
</mapper>

View File

@ -157,8 +157,7 @@
select
<include refid="Field"></include>,
(select h.HIDDEN_ID from BUS_HIDDENDANGERCHECKSTANDARD_HIDDEN h where h.RECORDITEM_ID=f.RECORDITEM_ID and h.CHECKRECORD_ID=f.CHECKRECORD_ID and h.ISDELETE= '0') as HIDDEN_ID,
( select count(1) from bus_imgfiles i where i.FOREIGN_KEY = f.RECORDITEM_ID and i.TYPE = '14' ) AS IMGCOUNT,
r.IDENTIFICATION_ID
( select count(1) from bus_imgfiles i where i.FOREIGN_KEY = f.RECORDITEM_ID and i.TYPE = '14' ) AS IMGCOUNT
from
<include refid="tableName"></include> f
where f.CHECKRECORD_ID=#{CHECKRECORD_ID}

View File

@ -22,6 +22,7 @@
f.OPERATOR,
f.OPERATTIME,
f.ISDELETE,
f.CHECK_USERS,
f.LONGITUDE,
f.LATITUDE,
f.CHECKRECORD_ID,
@ -32,7 +33,8 @@
f.TYPE,
f.PERIODSTART,
f.PERIODEND,
f.ISSTATISTICS
f.ISSTATISTICS,
f.IMEI
</sql>
<!-- 字段用于新增 -->
@ -210,7 +212,6 @@
order by IFNULL( f.CHECK_TIME, f.PERIODEND ) desc
</select>
<select id="datalistPage" parameterType="page" resultType="pd">
select
f.CUSTOM_ID,
f.CORPINFO_ID,
@ -247,7 +248,7 @@
<if test="pd.CUSTOM_ID != null and pd.CUSTOM_ID != ''">
and
(
f.CUSTOM_ID = #{CUSTOM_ID}
f.CUSTOM_ID = #{pd.CUSTOM_ID}
)
</if>
<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID != ''">

View File

@ -445,8 +445,7 @@
chd.NAME CHECKDEPTNAME,
lv.NAME HIDDENLEVELNAME,
bc.LIST_NAME,
Bb.NAME as HIDDEN_CATEGORY_NAME,
bri.RISK_UNIT_ID
Bb.NAME as HIDDEN_CATEGORY_NAME
from
<include refid="tableName"></include> f
left join sys_user cr on cr.USER_ID = f.CREATOR
@ -458,8 +457,7 @@
left join bus_checkrecord bc on bc.CHECKRECORD_ID = f.CHECKRECORD_ID and bc.ISDELETE = 0
left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
left join SYS_DICTIONARIES Bb on f.HIDDEN_CATEGORY = Bb.DICTIONARIES_ID
left join bus_recorditem br on br.RECORDITEM_ID = f.RECORDITEM_ID
left join bus_riskpoint bri on bri.RISKPOINT_ID = br.RISKPOINT_ID
left join BUS_HIDDENDANGERCHECKSTANDARD_RECORDITEM br on br.RECORDITEM_ID = f.RECORDITEM_ID
where
f.HIDDEN_ID = #{HIDDEN_ID}
</select>

View File

@ -421,57 +421,6 @@
where
CUSTOM_ID = #{CUSTOM_ID}
</update>
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
NAME = #{NAME},
PERIOD = #{PERIOD},
TYPE = #{TYPE},
ACOUNT = #{ACOUNT},
BCOUNT = #{BCOUNT},
CCOUNT = #{CCOUNT},
DCOUNT = #{DCOUNT},
<if test="BAO_BAO_DEPARTMENT_ID != null or BAO_BAO_DEPARTMENT_ID != ''">
BAO_BAO_DEPARTMENT_ID = #{BAO_BAO_DEPARTMENT_ID},
</if>
<if test="ISDELETE != null or ISDELETE != ''">
ISDELETE = #{ISDELETE},
</if>
<if test="BAO_BAO_USER_ID != null or BAO_BAO_USER_ID != ''">
BAO_BAO_USER_ID = #{BAO_BAO_USER_ID},
</if>
<if test="BAO_BAO_TYPE != null or BAO_BAO_TYPE != ''">
BAO_BAO_TYPE = #{BAO_BAO_TYPE},
</if>
<if test="TASK_TYPE != null or TASK_TYPE != ''">
TASK_TYPE = #{TASK_TYPE},
</if>
<if test="DEPARTMENT_ID != null or DEPARTMENT_ID != ''">
DEPARTMENT_ID= #{DEPARTMENT_ID},
</if>
<if test="POST_ID != null or POST_ID != ''">
POST_ID =#{POST_ID},
</if>
<if test="SCREENTYPE != null or SCREENTYPE != ''">
SCREENTYPE =#{SCREENTYPE},
</if>
<if test="START_DATE != null or START_DATE != ''">
START_DATE =#{START_DATE},
</if>
<if test="END_DATE != null or END_DATE != ''">
END_DATE =#{END_DATE},
</if>
<if test="OVERTIMENUM != null or OVERTIMENUM != ''">
OVERTIMENUM =#{OVERTIMENUM},
</if>
<if test="USER_ID != null or USER_ID!= ''">
USER_ID =#{USER_ID},
</if>
CUSTOM_ID = CUSTOM_ID
where
CUSTOM_ID = #{CUSTOM_ID}
</update>
<!-- 通过ID获取数据 -->
<select id="findById" parameterType="pd" resultType="pd">
@ -1100,4 +1049,54 @@
ORDER BY d.DEP_ORDER,po.POST_ID,f.USER_ID,f.PERIOD
</select>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
NAME = #{NAME},
PERIOD = #{PERIOD},
TYPE = #{TYPE},
<if test="BAO_BAO_DEPARTMENT_ID != null or BAO_BAO_DEPARTMENT_ID != ''">
BAO_BAO_DEPARTMENT_ID = #{BAO_BAO_DEPARTMENT_ID},
</if>
<if test="ISDELETE != null or ISDELETE != ''">
ISDELETE = #{ISDELETE},
</if>
<if test="BAO_BAO_USER_ID != null or BAO_BAO_USER_ID != ''">
BAO_BAO_USER_ID = #{BAO_BAO_USER_ID},
</if>
<if test="BAO_BAO_TYPE != null or BAO_BAO_TYPE != ''">
BAO_BAO_TYPE = #{BAO_BAO_TYPE},
</if>
<if test="TASK_TYPE != null or TASK_TYPE != ''">
TASK_TYPE = #{TASK_TYPE},
</if>
<if test="DEPARTMENT_ID != null or DEPARTMENT_ID != ''">
DEPARTMENT_ID= #{DEPARTMENT_ID},
</if>
<if test="POST_ID != null or POST_ID != ''">
POST_ID =#{POST_ID},
</if>
<if test="SCREENTYPE != null or SCREENTYPE != ''">
SCREENTYPE =#{SCREENTYPE},
</if>
<if test="START_DATE != null or START_DATE != ''">
START_DATE =#{START_DATE},
</if>
<if test="END_DATE != null or END_DATE != ''">
END_DATE =#{END_DATE},
</if>
<if test="OVERTIMENUM != null or OVERTIMENUM != ''">
OVERTIMENUM =#{OVERTIMENUM},
</if>
<if test="USER_ID != null or USER_ID!= ''">
USER_ID =#{USER_ID},
</if>
CUSTOM_ID = CUSTOM_ID
where
CUSTOM_ID = #{CUSTOM_ID}
</update>
</mapper>

View File

@ -89,5 +89,195 @@
or ( f.DICTIONARY_SOURCE = 2
and f.CORPINFO_ID = #{CORPINFO_ID} )
</if>
order by f.DICTIONARY_LEVEL desc , f.DICTIONARY_SORT desc
</select>
<!-- 新增-->
<insert id="save" parameterType="pd">
insert into
<include refid="tableName"></include>
(
<include refid="Field2"></include>
) values (
<include refid="FieldValue"></include>
)
</insert>
<!-- 删除-->
<delete id="delete" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1',
DELETEOR_ID = #{DELETEOR_ID},
DELETEOR_NAME = #{DELETEOR_NAME},
DELETE_TIME = #{DELETE_TIME}
where
DICTIONARY_ID = #{DICTIONARY_ID}
</delete>
<!-- 修改 -->
<update id="edit" parameterType="pd">
update
<include refid="tableName"></include>
set
<if test="DICTIONARY_NAME != null and DICTIONARY_NAME != ''">
DICTIONARY_NAME = #{DICTIONARY_NAME},
</if>
<if test="PARENT_ID != null and PARENT_ID != ''">
PARENT_ID = #{PARENT_ID},
</if>
<if test="PARENT_IDS != null and PARENT_IDS != ''">
PARENT_IDS = #{PARENT_IDS},
</if>
<if test="DICTIONARY_NAMES != null and DICTIONARY_NAMES != ''">
DICTIONARY_NAMES = #{DICTIONARY_NAMES},
</if>
<if test="DICTIONARY_LEVEL != null">
DICTIONARY_LEVEL = #{DICTIONARY_LEVEL},
</if>
<if test="DICTIONARY_SORT != null">
DICTIONARY_SORT = #{DICTIONARY_SORT},
</if>
<if test="DICTIONARY_SOURCE != null">
DICTIONARY_SOURCE = #{DICTIONARY_SOURCE},
</if>
<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
CORPINFO_ID = #{CORPINFO_ID},
</if>
<if test="ISDELETE != null and ISDELETE != ''">
ISDELETE = #{ISDELETE},
</if>
<if test="CREATOR_ID != null and CREATOR_ID != ''">
CREATOR_ID = #{CREATOR_ID},
</if>
<if test="CREATOR_NAME != null and CREATOR_NAME != ''">
CREATOR_NAME = #{CREATOR_NAME},
</if>
<if test="CREATE_TIME != null and CREATE_TIME != ''">
CREATE_TIME = #{CREATE_TIME},
</if>
<if test="OPERATOR_ID != null and OPERATOR_ID != ''">
OPERATOR_ID = #{OPERATOR_ID},
</if>
<if test="OPERATOR_NAME != null and OPERATOR_NAME != ''">
OPERATOR_NAME = #{OPERATOR_NAME},
</if>
<if test="OPERATE_TIME != null and OPERATE_TIME != ''">
OPERATE_TIME = #{OPERATE_TIME},
</if>
<if test="DELETEOR_ID != null and DELETEOR_ID != ''">
DELETEOR_ID = #{DELETEOR_ID},
</if>
<if test="DELETEOR_NAME != null and DELETEOR_NAME != ''">
DELETEOR_NAME = #{DELETEOR_NAME},
</if>
<if test="DELETE_TIME != null and DELETE_TIME != ''">
DELETE_TIME = #{DELETE_TIME},
</if>
DICTIONARY_ID = DICTIONARY_ID
where
DICTIONARY_ID = #{DICTIONARY_ID}
</update>
<!-- 通过ID获取数据 -->
<select id="findById" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where
f.DICTIONARY_ID = #{DICTIONARY_ID}
</select>
<!-- 列表 -->
<select id="datalistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
<if test="pd.DICTIONARY_NAME != null and pd.DICTIONARY_NAME != ''">
and f.DICTIONARY_NAME like CONCAT(CONCAT('%', #{pd.DICTIONARY_NAME}),'%')
</if>
<if test="pd.DICTIONARY_NAMES != null and pd.DICTIONARY_NAMES != ''">
and f.DICTIONARY_NAMES like CONCAT(CONCAT('%', #{pd.DICTIONARY_NAMES}),'%')
</if>
order by f.DICTIONARY_SORT asc
</select>
<!-- 列表(全部) -->
<select id="listAll" parameterType="pd" resultType="pd">
select
CASE f.DICTIONARY_LEVEL
WHEN 1 THEN
COUNT(cca.COMMON_ITEM_ID)+COUNT(cua.CUSTOM_ITEM_ID)
WHEN 2 THEN
COUNT(cci.COMMON_ITEM_ID)+COUNT(cui.CUSTOM_ITEM_ID)
END COUNT_USE,
<include refid="Field"></include>
from
<include refid="tableName"></include> f
left join bus_hiddendangercheckstandard_common_item cca on cca.CHECK_CATEGORY = f.DICTIONARY_ID
left join bus_hiddendangercheckstandard_common_item cci on cci.CHECK_ITEM = f.DICTIONARY_ID
left join bus_hiddendangercheckstandard_custom_item cua on cua.CHECK_CATEGORY = f.DICTIONARY_ID
left join bus_hiddendangercheckstandard_custom_item cui on cui.CHECK_ITEM = f.DICTIONARY_ID
where f.ISDELETE = '0'
group by f.DICTIONARY_ID
order by f.DICTIONARY_LEVEL asc, f.DICTIONARY_SORT asc
</select>
<!-- 批量删除 -->
<delete id="deleteAll" parameterType="pd">
update
<include refid="tableName"></include>
set
ISDELETE = '1',
DELETEOR_ID = #{DELETEOR_ID},
DELETEOR_NAME = #{DELETEOR_NAME},
DELETE_TIME = #{DELETE_TIME}
where
DICTIONARY_ID in
<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- * 获取符合条件数,+1后作为排序使用-->
<select id="getCount" parameterType="pd" resultType="Integer" >
SELECT
COUNT(*)
FROM
<include refid="tableName"></include> f
WHERE
<if test="DICTIONARY_LEVEL != null">
DICTIONARY_LEVEL = #{DICTIONARY_LEVEL}
</if>
</select>
<!-- 列表(全部) -->
<select id="listSelect" parameterType="pd" resultType="pd">
select
f.DICTIONARY_ID,
f.DICTIONARY_NAME,
f.PARENT_IDS
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
<if test="DICTIONARY_LEVEL != null and DICTIONARY_LEVEL != ''">
and f.DICTIONARY_LEVEL = #{DICTIONARY_LEVEL}
</if>
<if test="COMMON_ID != null and COMMON_ID != ''">
<choose>
<when test="DICTIONARY_LEVEL == 1">
and exists(select 1 from BUS_HIDDENDANGERCHECKSTANDARD_COMMON_ITEM ci where ci.CHECK_CATEGORY = f.DICTIONARY_ID and
ci.ISDELETE = '0' and ci.COMMON_ID = #{COMMON_ID}
</when>
<when test="DICTIONARY_LEVEL == 2">
and exists(select 1 from BUS_HIDDENDANGERCHECKSTANDARD_COMMON_ITEM ci where ci.CHECK_ITEM = f.DICTIONARY_ID and
ci.ISDELETE = '0' and ci.COMMON_ID = #{COMMON_ID}
</when>
</choose>
</if>
order by f.DICTIONARY_SORT asc
</select>
</mapper>

View File

@ -23,10 +23,7 @@
TBSNAME,
TBFIELD,
YNDEL,
DICTIONARIES_ID,
ISDELETE,
VISIBLE
DICTIONARIES_ID
</sql>
<!-- 字段 -->
@ -53,9 +50,7 @@
#{TBSNAME},
#{TBFIELD},
#{YNDEL},
#{DICTIONARIES_ID},
#{ISDELETE},
#{VISIBLE}
#{DICTIONARIES_ID}
</sql>
<!-- 新增-->
@ -91,7 +86,6 @@
from
<include refid="tableName"></include>
where
ISDELETE = 0 and
DICTIONARIES_ID = #{DICTIONARIES_ID}
</select>
<select id="findByName" parameterType="pd" resultType="pd">
@ -100,7 +94,6 @@
from
<include refid="tableName"></include>
where
ISDELETE = 0 and
NAME = #{NAME}
</select>
@ -111,7 +104,6 @@
from
<include refid="tableName"></include>
where
ISDELETE = 0 and
BIANMA = #{BIANMA}
</select>
@ -122,7 +114,6 @@
from
<include refid="tableName"></include>
where
ISDELETE = 0 and
PARENT_ID = #{parentId} order by ORDER_BY ASC
</select>
@ -132,7 +123,7 @@
<include refid="Field"></include>
from
<include refid="tableName"></include>
where ISDELETE = 0
where
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and f.PROMISE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
</if>
@ -146,11 +137,6 @@
from
<include refid="tableName"></include>
where
ISDELETE = 0
<if test="pd.DICTIONARIES_ID == '0'.toString()"><!-- 检索 -->
and VISIBLE = #{ pd.VISIBLE }
</if>
<if test="pd.DICTIONARIES_ID!= null and pd.DICTIONARIES_ID != ''"><!-- 检索 -->
and PARENT_ID = #{pd.DICTIONARIES_ID}
</if>
@ -192,7 +178,6 @@
from
<include refid="tableName"></include>
where
ISDELETE = 0 and
DICTIONARIES_ID in
<foreach item="item" index="index" collection="array" open="(" separator="," close=")">
#{item}
@ -208,9 +193,7 @@
f.DICTIONARIES_ID, f.NAME, f.BIANMA, p.NAME PARENTNAME, p.BIANMA PARENTBIANMA
FROM sys_dictionaries f
LEFT JOIN sys_dictionaries p ON p.DICTIONARIES_ID = f.PARENT_ID
WHERE
ISDELETE = 0 and
p.PARENT_ID = #{PARENT_ID}
WHERE p.PARENT_ID = #{PARENT_ID}
order by f.ORDER_BY ASC
</select>
@ -230,7 +213,6 @@
</otherwise>
</choose>
WHERE
ISDELETE = 0 and
f.PARENT_ID = #{DICTIONARIES_ID} AND c.ISDELETE = '0' GROUP BY f.DICTIONARIES_ID ORDER BY f.ORDER_BY ASC
</select>
<!-- 通过ID获取其子级列表 -->
@ -248,7 +230,6 @@
from
<include refid="tableName"></include> t
where
ISDELETE = 0 and
PARENT_ID = #{parentId} order by ORDER_BY
</select>
<!-- 查询同一父级下的所有子集 -->
@ -266,7 +247,6 @@
FROM
<include refid="tableName"></include> f
WHERE
ISDELETE = 0 and
f.PARENT_ID = #{PARENT_ID}
ORDER BY
f.ORDER_BY
@ -275,7 +255,6 @@
select DICTIONARIES_ID ,queryRecursiveDictDown(DICTIONARIES_ID) ids
from sys_dictionaries
where
ISDELETE = 0 and
PARENT_ID = #{PARENT_ID}
</select>
</mapper>

View File

@ -172,7 +172,7 @@
and f.OUTSOURCED_ID = #{pd.OUTSOURCED_ID}
</if>
<if test="pd.PERSONNELMANAGEMENT_ID != null and pd.PERSONNELMANAGEMENT_ID != ''">
and f.PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID}
and f.PERSONNELMANAGEMENT_ID = #{pd.PERSONNELMANAGEMENT_ID}
</if>
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
@ -205,4 +205,27 @@
</foreach>
</delete>
<!-- 确认 -->
<update id="confirm" parameterType="pd">
update
<include refid="tableName"></include>
set
INSPECTION_STATUS = 1,
PERSON_SIGN_IMG = #{PERSON_SIGN_IMG},
PERSON_SIGN_TIME = #{PERSON_SIGN_TIME}
where
KEYPROJECTCHECK_ID = #{KEYPROJECTCHECK_ID}
</update>
<select id="getSmsList" parameterType="pd" resultType="pd">
SELECT ry.PHONENUM as PHONENUM,yh.HIDDENDESCR as HIDDENDESCR FROM BUS_KEYPROJECTCHECK t
LEFT JOIN `qa-gwj-regulatory`.BUS_OUTSOURCED gc on gc.OUTSOURCED_ID = t.OUTSOURCED_ID
LEFT JOIN BUS_KEYPROJECT_HIDDEN yh on yh.FOREIGN_ID = t.KEYPROJECTCHECK_ID
LEFT JOIN `qa-gwj-regulatory`.`BUS_PERSONNELMANAGEMENT` ry on ry.PERSONNELMANAGEMENT_ID = yh.RECTIFICATIONOR
WHERE t.KEYPROJECTCHECK_ID=#{KEYPROJECTCHECK_ID}
AND gc.IS_SMS = '0'
AND t.INSPECTION_STATUS = 1
</select>
</mapper>

View File

@ -316,9 +316,11 @@
ht.NAME HIDDENTYPE_NAME,
ht2.NAME HIDDENTYPE2_NAME,
crd.NAME HIDDENFINDDEPT_NAME,
cr.NAME CREATOR_NAME,
u.UNITS_NAME as RECTIFICATIONDEPT_NAME,
p.NAME as RECTIFICATIONOR_NAME,
bo.OUTSOURCED_NAME,
bo.PUNISH_THE_PERSON,
bod.OUTSOURCED_NAME AIOUTSOURCED_NAME,
pu.KEYPROJECTPUNISH_ID
from
@ -331,6 +333,7 @@
left join <include refid="dicTableName"></include> ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
left join BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
left join vi_user_all cr on cr.USER_ID = f.CREATOR
left join BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID
LEFT JOIN BUS_OUTSOURCED bod ON bod.OUTSOURCED_ID = f.FOREIGN_ID <!-- 用于AI隐患的重点工程名称 -->
left join BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
@ -363,6 +366,12 @@
<if test="pd.ISRECTIFY != null and pd.ISRECTIFY !='' and pd.ISRECTIFY == 2" >
and f.STATE &gt; 1
</if>
<if test="pd.ISCHECK != null and pd.ISCHECK !='' and pd.ISCHECK == 1" >
and f.STATE = 2
<if test="pd.CREATOR != null and pd.CREATOR !=''" >
and (f.CREATOR = #{pd.CREATOR} or bo.PUNISH_THE_PERSON like CONCAT(CONCAT('%', #{pd.CREATOR}),'%'))
</if>
</if>
<if test="pd.ISCHECK != null and pd.ISCHECK !='' and pd.ISCHECK == 2" >
and f.STATE = 4
</if>
@ -1597,4 +1606,84 @@
h.ISPUNISH ASC,
p.HANDLED DESC
</select>
<select id="getSmsList" parameterType="pd" resultType="pd">
SELECT IFNULL(ry.PHONE,ry.USERNAME) PHONE, t.HIDDENDESCR HIDDENDESCR FROM BUS_KEYPROJECT_HIDDEN t
LEFT JOIN bus_keyprojectcheck jc on t.FOREIGN_ID = jc.KEYPROJECTCHECK_ID
LEFT JOIN BUS_OUTSOURCED gc on gc.OUTSOURCED_ID = jc.OUTSOURCED_ID
LEFT JOIN vi_user_all ry on ry.USER_ID = jc.CREATOR
WHERE t.HIDDEN_ID=#{HIDDEN_ID}
AND gc.IS_SMS = '0'
</select>
<select id="getPUNISHTHEPERSON" parameterType="pd" resultType="string">
SELECT gc.PUNISH_THE_PERSON PUNISH_THE_PERSON FROM BUS_OUTSOURCED gc
WHERE gc.OUTSOURCED_ID=#{OUTSOURCED_ID}
AND gc.IS_SMS = '0'
</select>
<select id="getPhone" parameterType="pd" resultType="string">
SELECT
IFNULL(PHONE,USERNAME) PHONE FROM vi_user_all WHERE
<if test="ids!= null and ids.length>0">
USER_ID IN
<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</select>
<select id="hiddenlistPage" resultType="com.zcloud.entity.PageData">
select
f.*,
hr.HIDDENREGION HIDDENPART_NAME,
lv.NAME HIDDENLEVEL_NAME,
ht.NAME HIDDENTYPE_NAME,
ht2.NAME HIDDENTYPE2_NAME,
crd.NAME HIDDENFINDDEPT_NAME,
cr.NAME CREATOR_NAME,
u.UNITS_NAME as RECTIFICATIONDEPT_NAME,
p.NAME as RECTIFICATIONOR_NAME,
bo.OUTSOURCED_NAME,
bo.PUNISH_THE_PERSON,
pu.KEYPROJECTPUNISH_ID,
pu.HANDLED,
pu.REASON,
bu.UNITS_NAME,
bp.NAME AS PERSON_NAME
from
<include refid="tableName"></include> f
left join `qa-gwj-prevention`.bus_hiddenregion hr on hr.HIDDENREGION_ID = f.HIDDENPART
left join <include refid="dicTableName"></include> lv on f.HIDDENLEVEL = lv.BIANMA
left join <include refid="dicTableName"></include> ht on f.HIDDENTYPE = ht.BIANMA
left join <include refid="dicTableName"></include> ht2 on f.HIDDENTYPE2 = ht2.BIANMA and ht2.PARENT_ID = '18c0a9aea6e54feab9f4ab3f46e0bc86'
left join oa_department crd on crd.DEPARTMENT_ID = f.HIDDENFINDDEPT
left join vi_user_all cr on cr.USER_ID = f.CREATOR
left join BUS_UNITS u on u.UNITS_ID = f.RECTIFICATIONDEPT
left join BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID
left join BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.RECTIFICATIONOR
left join bus_keyprojectcheck keycheck on keycheck.OUTSOURCED_ID = f.FOREIGN_ID or f.FOREIGN_ID = keycheck.KEYPROJECTCHECK_ID
left join BUS_OUTSOURCED bo on keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
left join BUS_KEYPROJECTPUNISH pu on pu.HIDDEN_ID = f.HIDDEN_ID
left join BUS_UNITS bu on bu.UNITS_ID = pu.UNITS_ID
left join BUS_PERSONNELMANAGEMENT bp on bp.PERSONNELMANAGEMENT_ID = pu.PERSONNELMANAGEMENT_ID
where f.ISDELETE = '0' and (f.SOURCE in ('4','5') or f.SOURCE ='1') and f.ISPUNISH = '1'
<if test="pd.HANDLED != null and pd.HANDLED != ''">
and o.HANDLED = #{pd.HANDLED}
</if>
<if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID != ''">
and f.FOREIGN_ID in
(select k.KEYPROJECTCHECK_ID from BUS_KEYPROJECTCHECK k left join BUS_KEYPROJECTPUNISH sh on k.KEYPROJECTCHECK_ID = sh.KEYPROJECTCHECK_ID where k.OUTSOURCED_ID = #{pd.OUTSOURCED_ID} and sh.ISDELETE = '0')
</if>
group by f.HIDDEN_ID
order by f.CREATTIME desc, f.STATE desc
</select>
<select id="getCorpInfoIdByHiddenId" parameterType="pd" resultType="string">
select ry.CORPINFO_ID from
<include refid="tableName"></include> f
left join bus_keyprojectcheck keycheck on keycheck.OUTSOURCED_ID = f.FOREIGN_ID or f.FOREIGN_ID = keycheck.KEYPROJECTCHECK_ID
left join BUS_OUTSOURCED bo on keycheck.OUTSOURCED_ID = bo.OUTSOURCED_ID
LEFT JOIN vi_user_all ry on ry.USER_ID = bo.CREATOR
where f.HIDDEN_ID = #{HIDDEN_ID}
</select>
</mapper>

View File

@ -162,27 +162,29 @@
select
<include refid="Field"></include>,
cre.NAME CREATOR_NAMES,
o.OUTSOURCED_ID,
o.OUTSOURCED_NAME,
bo.OUTSOURCED_ID,
bo.OUTSOURCED_NAME,
u.UNITS_NAME,
p.NAME AS PERSON_NAME
from
<include refid="tableName"></include> f
left join sys_user cre on cre.USER_ID = f.CREATOR
left join BUS_UNITS u on u.UNITS_ID = f.UNITS_ID
left join BUS_OUTSOURCED o on o.UNITS_ID = u.UNITS_ID
left join bus_keyproject_hidden h on f.HIDDEN_ID = h.HIDDEN_ID
LEFT JOIN BUS_KEYPROJECTCHECK ch ON ch.OUTSOURCED_ID = h.FOREIGN_ID or h.FOREIGN_ID = ch.KEYPROJECTCHECK_ID
LEFT JOIN BUS_OUTSOURCED bo ON bo.OUTSOURCED_ID = ch.OUTSOURCED_ID <!-- 用于安全环保检查隐患的重点工程名称 -->
left join BUS_PERSONNELMANAGEMENT p on p.PERSONNELMANAGEMENT_ID = f.PERSONNELMANAGEMENT_ID
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
o.OUTSOURCED_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
bo.OUTSOURCED_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
u.UNITS_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
<if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID !='' " >
and o.OUTSOURCED_ID = #{pd.OUTSOURCED_ID}
and bo.OUTSOURCED_ID = #{pd.OUTSOURCED_ID}
</if>
<if test="pd.HANDLED != null and pd.HANDLED !='' and pd.HANDLED == 1" >
and f.HANDLED = 0

View File

@ -59,11 +59,16 @@
f.RECORDSPATH,
f.SHEETPATH,
f.EXAMINATIONPATH,
f.OATTACHMENTSPATH
f.OATTACHMENTSPATH,
f.PUNISH_THE_PERSON
</sql>
<!-- 字段用于新增 -->
<sql id="Field2">
IS_SMS,
PUNISH_THE_PERSON,
INVOLVING_CORPS_DEPART_ID,
COMPETENT_DEPT_ID,
DEPARTMENT_ID,
CONTRACT_PIC,
OUTSOURCED_NAME,
@ -114,6 +119,10 @@
<!-- 字段值 -->
<sql id="FieldValue">
#{IS_SMS},
#{PUNISH_THE_PERSON},
#{INVOLVING_CORPS_DEPART_ID},
#{COMPETENT_DEPT_ID},
#{DEPARTMENT_ID},
#{CONTRACT_PIC},
#{OUTSOURCED_NAME},
@ -238,9 +247,25 @@
f.*,
a.NAME as DEPARTMENT_NAME,
b.UNITS_NAME as UNITS_NAME,
pcij.NAME Q_DEPARTMENT_NAME,
pci.NAME Q_COMPETENT_DEPT_NAME,
vua.NAME OUTSOURCED_CREATOR_NAME,
isdd.NAME MANAGER_DEPARTMENT_NAME,
ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
( select count(1) from BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT,
( select GROUP_CONCAT(t.CORP_NAME) from BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
(select GROUP_CONCAT(t.NAME) from ( SELECT CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID FROM OA_DEPARTMENT t LEFT JOIN bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
(select NAME FROM bus_personnelmanagement p where p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC) as UNITS_PIC_NAME,
c.NAME as CONTRACT_NAME
from
<include refid="tableName"></include> f
LEFT JOIN vi_user_all vua on f.CREATOR = vua.USER_ID
LEFT JOIN vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
LEFT JOIN oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
LEFT JOIN oa_department isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
LEFT JOIN oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
left join oa_department a on a.DEPARTMENT_ID = f.DEPARTMENT_ID
left join bus_units b using (UNITS_ID)
left join sys_user c on c.USER_ID= f.CONTRACT_PIC
@ -296,11 +321,28 @@
f.EXAMINATIONPATH,
f.OATTACHMENTSPATH,
a.NAME as DEPARTMENT_ID,
b.UNITS_NAME as UNITS_NAME
pcij.NAME Q_DEPARTMENT_NAME,
isdd.NAME MANAGER_DEPARTMENT_NAME,
b.UNITS_NAME as UNITS_NAME,
vua.NAME OUTSOURCED_CREATOR_NAME,
pci.NAME Q_COMPETENT_DEPT_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
( select count(1) from BUS_KEYPROJECTCHECK c where c.OUTSOURCED_ID = f.OUTSOURCED_ID) as CHECK_COUNT,
( select GROUP_CONCAT(t.CORP_NAME) from BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
(select GROUP_CONCAT(t.NAME) from ( SELECT CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME ,t.DEPARTMENT_ID FROM OA_DEPARTMENT t LEFT JOIN bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
p.`NAME` as UNITS_PIC_NAME
from
<include refid="tableName"></include> f
LEFT JOIN oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
LEFT JOIN oa_department isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
LEFT JOIN oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
left join oa_department a on a.DEPARTMENT_ID = f.DEPARTMENT_ID
left join bus_units b using (UNITS_ID)
LEFT JOIN vi_user_all vua on f.CREATOR = vua.USER_ID
LEFT JOIN vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
LEFT JOIN bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
@ -317,6 +359,9 @@
<if test="pd.STATE != null and pd.STATE !=''">
and f.STATE = #{pd.STATE}
</if>
<if test="pd.UNITS_ID != null and pd.UNITS_ID !=''">
and f.UNITS_ID = #{pd.UNITS_ID}
</if>
<if test="pd.CONTRACT_STIME != null and pd.CONTRACT_STIME !=''">
and (f.CONTRACT_STIME between #{pd.CONTRACT_STIME} and #{pd.CONTRACT_ETIME}
or f.CONTRACT_ETIME between #{pd.CONTRACT_STIME} and #{pd.CONTRACT_ETIME}
@ -349,4 +394,305 @@
</foreach>
</delete>
<select id="homepagedata" parameterType="pd" resultType="pd">
select
count(1) as INSPECTION_COUNT,
(select count(1) from bus_keyproject_hidden where RECTIFICATIONOR = #{PERSONNELMANAGEMENT_ID} and state = '1' and ISDELETE = '0') as HIDDEN_COUNT,
(select count(1) from bus_keyprojectpunish where HANDLED = '0' and PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID}) as PUNISH_COUNT
from bus_keyprojectcheck f
where
f.PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID}
and INSPECTION_STATUS = '0'
<if test="UNITS_ID != null and UNITS_ID !=''">
and f.UNITS_ID = #{UNITS_ID}
</if>
</select>
<select id="getDeptId" resultType="string">
SELECT
DEPARTMENT_ID
FROM
`sys_user`
WHERE
`USER_ID` =#{userId}
</select>
<select id="getCorpInfoByOutsourcesCreator" parameterType="pd" resultType="string">
SELECT
v.CORPINFO_ID
FROM
bus_outsourced o
LEFT JOIN vi_user_all v on v.USER_ID=o.CREATOR
WHERE
OUTSOURCED_ID = #{OUTSOURCED_ID}
</select>
<!-- APP工程申请列表 -->
<select id="applylistPage" parameterType="page" resultType="pd">
select
f.*,
(select GROUP_CONCAT(t.CORP_NAME) from BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.INVOLVING_CORPS)) as INVOLVING_CORPS_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
( SELECT GROUP_CONCAT( t.NAME ) FROM oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
(select GROUP_CONCAT(t.CORP_NAME) from BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
isu.NAME USER_NAME,
b.UNITS_NAME as UNITS_NAME,
isu.NAME as AIWARNING_PEOPLE,
pcij.NAME Q_DEPARTMENT_NAME,
vua.NAME as OUTSOURCED_CREATOR_NAME,
ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME,
p.`NAME` as UNITS_PIC_NAME
from
<include refid="tableName"></include> f
left join bus_units b using (UNITS_ID)
LEFT JOIN oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
LEFT JOIN SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
LEFT JOIN vi_user_all vua on f.CREATOR = vua.USER_ID
LEFT JOIN vi_all_corp vac on vua.CORPINFO_ID = vac.CORPINFO_ID
LEFT JOIN bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
where f.ISDELETE = '0' and f.STATE in ('0','1')
<!-- 目前必须有 根据创建人的公司查询 -->
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''">
and vac.CORPINFO_ID = #{pd.CORPINFO_ID}
</if>
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
<!-- 根据需求自己加检索条件-->
f.OUTSOURCED_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
b.UNITS_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
f.UNITS_PIC LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
or
pcij.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
<if test="pd.PERSONNELMANAGEMENT_ID != null and pd.PERSONNELMANAGEMENT_ID !=''">
and f.UNITS_PIC = #{pd.PERSONNELMANAGEMENT_ID}
</if>
<if test="pd.OUTSOURCED_NAME != null and pd.OUTSOURCED_NAME !=''">
and f.OUTSOURCED_NAME = #{pd.OUTSOURCED_NAME}
</if>
<if test="pd.UNITS_ID != null and pd.UNITS_ID !=''">
and f.UNITS_ID = #{pd.UNITS_ID}
</if>
<if test="pd.INVOLVING_CORP != null and pd.INVOLVING_CORP !=''">
and f.INVOLVING_CORPS LIKE CONCAT(CONCAT('%', #{pd.INVOLVING_CORP}),'%')
</if>
<if test="pd.DEPARTMENT_ID != null and pd.DEPARTMENT_ID !=''">
and f.DEPARTMENT_ID LIKE CONCAT(CONCAT('%', #{pd.DEPARTMENT_ID}),'%')
</if>
<if test="pd.COMPETENT_DEPT_ID != null and pd.COMPETENT_DEPT_ID !=''">
and f.COMPETENT_DEPT_ID LIKE CONCAT(CONCAT('%', #{pd.COMPETENT_DEPT_ID}),'%')
</if>
<if test="pd.GROUP_UNIT != null and pd.GROUP_UNIT !=''">
and f.GROUP_UNIT LIKE CONCAT(CONCAT('%', #{pd.GROUP_UNIT}),'%')
</if>
<if test="pd.CORP_NAME != null and pd.CORP_NAME !=''">
and vac.CORP_NAME LIKE CONCAT(CONCAT('%', #{pd.CORP_NAME}),'%')
</if>
<if test="pd.CONTRACT_STIME != null and pd.CONTRACT_STIME !=''">
and (f.CONTRACT_STIME between #{pd.CONTRACT_STIME} and #{pd.CONTRACT_ETIME}
or f.CONTRACT_ETIME between #{pd.CONTRACT_STIME} and #{pd.CONTRACT_ETIME}
or (f.CONTRACT_STIME &lt; #{pd.CONTRACT_STIME} and f.CONTRACT_ETIME &gt; #{pd.CONTRACT_ETIME}))
</if>
ORDER BY
f.STATE ASC,
f.OPERATTIME DESC
</select>
<update id="editDingWei" parameterType="pd">
update
<include refid="tableName"></include>
set
WORK_LONGITUDE = #{WORK_LONGITUDE},
WORK_LATITUDE = #{WORK_LATITUDE},
LOCATION = #{LOCATION}
where
OUTSOURCED_ID = #{OUTSOURCED_ID}
</update>
<select id="jieshuOutSourced" parameterType="pd" resultType="pd">
SELECT
o.OUTSOURCED_ID,
IFNULL( QR.qr, 0 ) qr,
IFNULL( ZG.zg, 0 ) zg,
IFNULL( YS.ys, 0 ) ys,
IFNULL( CF.cf, 0 ) cf,
IFNULL( FK.fk, 0 ) fk,
IFNULL( AI.ai, 0 ) ai
FROM
bus_outsourced o
<!-- 检查待确认 -->
LEFT JOIN (
SELECT
COUNT( 1 ) qr,
c.OUTSOURCED_ID
FROM
bus_keyprojectcheck c
WHERE
c.INSPECTION_STATUS = 0
AND c.ISDELETE = 0
GROUP BY
c.OUTSOURCED_ID
) QR ON QR.OUTSOURCED_ID = o.OUTSOURCED_ID
<!-- 隐患待整改 -->
LEFT JOIN (
SELECT
COUNT( f.HIDDEN_ID ) zg,
f.OUTSOURCED_ID
FROM
(
SELECT
h.HIDDEN_ID,
IFNULL( c.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID
FROM
bus_keyproject_hidden h
LEFT JOIN bus_keyprojectcheck c ON h.FOREIGN_ID = c.KEYPROJECTCHECK_ID
WHERE
h.STATE = 1
AND h.ISDELETE = 0
) f
GROUP BY
f.OUTSOURCED_ID
) ZG ON ZG.OUTSOURCED_ID = o.OUTSOURCED_ID
<!-- 隐患待验收 -->
LEFT JOIN (
SELECT
COUNT( DISTINCT t.HIDDEN_ID ) ys,
t.OUTSOURCED_ID
FROM
(
SELECT
f.HIDDEN_ID,
IFNULL( c.OUTSOURCED_ID, f.FOREIGN_ID ) OUTSOURCED_ID
FROM
BUS_KEYPROJECT_HIDDEN f
LEFT JOIN bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
AND f.STATE = '2'
) t
GROUP BY
t.OUTSOURCED_ID
) YS ON YS.OUTSOURCED_ID = o.OUTSOURCED_ID
<!-- 隐患待处罚 -->
LEFT JOIN (
SELECT
COUNT( DISTINCT t.HIDDEN_ID ) cf,
t.OUTSOURCED_ID
FROM
(
SELECT
f.HIDDEN_ID,
IFNULL( c.OUTSOURCED_ID, f.FOREIGN_ID ) OUTSOURCED_ID
FROM
BUS_KEYPROJECT_HIDDEN f
LEFT JOIN bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
WHERE
f.ISDELETE = '0'
AND f.SOURCE IN ( '4', '5', '1' )
AND (f.ISPUNISH is NULL OR f.ISPUNISH = '')
) t
GROUP BY
t.OUTSOURCED_ID
) CF on CF.OUTSOURCED_ID = o.OUTSOURCED_ID
<!-- 处罚待反馈 -->
LEFT JOIN (
SELECT
COUNT( DISTINCT t.HIDDEN_ID ) fk,
t.OUTSOURCED_ID
FROM
(
SELECT
p.HIDDEN_ID,
IFNULL( c.OUTSOURCED_ID, f.FOREIGN_ID ) OUTSOURCED_ID
FROM
bus_keyprojectpunish p
LEFT JOIN BUS_KEYPROJECT_HIDDEN f on p.HIDDEN_ID = f.HIDDEN_ID
LEFT JOIN bus_keyprojectcheck c ON c.KEYPROJECTCHECK_ID = f.FOREIGN_ID
WHERE
p.ISDELETE = '0'
AND p.HANDLED = '0'
) t
GROUP BY
t.OUTSOURCED_ID
) FK ON FK.OUTSOURCED_ID = o.OUTSOURCED_ID
<!-- ai报警待处置 -->
LEFT JOIN (
SELECT
count( 1 ) AS ai ,t.OUTSOURCED_ID
FROM
bus_aiwarning f
LEFT JOIN (
SELECT DISTINCT
vi.VIDEOMANAGER_ID,
aip.OUTSOURCED_ID
FROM
bus_aiwarning_people aip
LEFT JOIN bus_videomanager vi ON vi.OUTSOURCED_ID = aip.OUTSOURCED_ID
WHERE
aip.ISDELETE = 0
AND vi.VIDEOMANAGER_ID IS NOT NULL
) t ON t.VIDEOMANAGER_ID = f.VIDEOMANAGER_ID
WHERE
f.ISDELETE = 0
AND f.STATUS = 0
GROUP BY t.OUTSOURCED_ID
) AI ON AI.OUTSOURCED_ID = o.OUTSOURCED_ID
WHERE o.OUTSOURCED_ID=#{OUTSOURCED_ID}
</select>
<!-- 修改 -->
<update id="jie" parameterType="pd">
update
<include refid="tableName"></include>
set
DEPARTMENT_ID = #{DEPARTMENT_ID},
CONTRACT_PIC = #{CONTRACT_PIC},
OUTSOURCED_NAME = #{OUTSOURCED_NAME},
INVOLVING_CORPS = #{INVOLVING_CORPS},
STARTTIME = #{STARTTIME},
ENDTIME = #{ENDTIME},
CONTRACT_STIME = #{CONTRACT_STIME},
CONTRACT_ETIME = #{CONTRACT_ETIME},
UNITS_ID = #{UNITS_ID},
CONTRACT_NUM = #{CONTRACT_NUM},
UNITS_APTITUDE = #{UNITS_APTITUDE},
UNITS_PIC = #{UNITS_PIC},
UNITS_PHONE = #{UNITS_PHONE},
MANAGE_NAME = #{MANAGE_NAME},
DESIGE = #{DESIGE},
MANAGE_APTITUDE = #{MANAGE_APTITUDE},
MANAGE_PIC = #{MANAGE_PIC},
MANAGE_PHONE = #{MANAGE_PHONE},
MEASURES = #{MEASURES},
ATTACHMENTS = #{ATTACHMENTS},
REMARKS = #{REMARKS},
TRAINING_NAME = #{TRAINING_NAME},
TRAINING_PIC = #{TRAINING_PIC},
TRAINING_STIME = #{TRAINING_STIME},
TRAINING_ETIME = #{TRAINING_ETIME},
RECORDS = #{RECORDS},
SHEET = #{SHEET},
EXAMINATION = #{EXAMINATION},
OATTACHMENTS = #{OATTACHMENTS},
APPLICANT = #{APPLICANT},
PUNISH_THE_PERSON = #{PUNISH_THE_PERSON},
STATE = '2',
OUTSOURCED_ID = OUTSOURCED_ID
where
OUTSOURCED_ID = #{OUTSOURCED_ID}
</update>
<update id="start">
update
<include refid="tableName"></include>
set
STATE = '1'
where
OUTSOURCED_ID = #{OUTSOURCED_ID}
</update>
</mapper>

View File

@ -211,9 +211,13 @@
<!-- 列表 -->
<select id="datalistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>
<include refid="Field"></include>,
u.`NAME` CREATOR_NAME,
c.CORP_NAME
from
<include refid="tableName"></include> f
LEFT JOIN sys_user u on f.CREATOR = u.USERNAME
LEFT JOIN bus_corp_info c on u.CORPINFO_ID = c.CORPINFO_ID
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and

View File

@ -48,6 +48,7 @@
CERTIFICATE_NUM,
REVIEWTIME,
PHONENUM,
PASSWORD,
IDENTITYCARD,
LICENSING,
VALID_STIME,
@ -72,6 +73,7 @@
#{CERTIFICATE_NUM},
#{REVIEWTIME},
#{PHONENUM},
#{PASSWORD},
#{IDENTITYCARD},
#{LICENSING},
#{VALID_STIME},
@ -136,6 +138,17 @@
PERSONNELMANAGEMENT_ID = #{PERSONNELMANAGEMENT_ID}
</update>
<!-- 通过ID获取数据 -->
<select id="findForLogin" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where
f.PHONENUM = #{PHONENUM} and f.PASSWORD = #{PASSWORD}
and f.ISDELETE='0'
</select>
<!-- 通过社会信用代码获取数据 -->
<select id="findByCertificate" parameterType="pd" resultType="pd" >
select
@ -163,12 +176,18 @@
select
f.*,
a.NAME as JOBTYPE,
r.UNITS_NAME as UNITS_NAME
o.NAME AS OPERATIONITEM_NAME,
r.UNITS_NAME as UNITS_NAME,
u.`NAME` CREATOR_NAME,
c.CORP_NAME as CREATOR_CORP_NAME
from
<include refid="tableName"></include> f
left join sys_dictionaries a on a.DICTIONARIES_ID = f.JOB_TYPE
left join sys_dictionaries o on o.DICTIONARIES_ID = f.OPERATIONITEM
left join bus_corp_info b on b.CORPINFO_ID = f.CORPINFO_ID
left join bus_units r on r.UNITS_ID = f.UNITS_ID
LEFT JOIN sys_user u on f.CREATOR = u.USERNAME
LEFT JOIN bus_corp_info c on u.CORPINFO_ID = c.CORPINFO_ID
where f.ISDELETE = '0'
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and

View File

@ -34,7 +34,8 @@
f.FILEPATH,
f.TYPE,
f.FOREIGN_KEY,
f.IMGFILES_ID
f.IMGFILES_ID,
f.FILE_NAME
</sql>
<!-- 字段用于新增 -->
@ -42,7 +43,8 @@
FILEPATH,
TYPE,
FOREIGN_KEY,
IMGFILES_ID
IMGFILES_ID,
FILE_NAME
</sql>
<!-- 字段值 -->
@ -50,7 +52,8 @@
#{FILEPATH},
#{TYPE},
#{FOREIGN_KEY},
#{IMGFILES_ID}
#{IMGFILES_ID},
#{FILE_NAME}
</sql>
<!-- 新增-->

View File

@ -141,6 +141,9 @@
AND
f.CORPINFO_ID = #{CORPINFO_ID}
</if>
<if test="NAME!= null and NAME != ''"><!-- 检索 -->
and f.NAME = #{NAME}
</if>
<if test="STATUS != null and STATUS != ''"><!-- 关键词检索 -->
AND
f.STATUS = #{STATUS}

View File

@ -645,6 +645,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND
u.POST_ID = #{POST_ID}
</if>
<if test="NAME != null and NAME != ''"><!-- 关键词检索 -->
AND
u.NAME = #{NAME}
</if>
<if test="NOSELF != null and NOSELF != ''"><!-- 关键词检索 -->
AND
u.USER_ID != #{LOGINUSERID}
@ -1411,4 +1415,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</select>
<select id="selectUserListByUserIds" resultType="com.zcloud.entity.PageData">
<if test=" ids != null and ids != ''">
select
f.NAME,
f.DEPARTMENT_ID as INSPECTION_DEPARTMENT_ID,
f.USER_ID as INSPECTION_USER_ID,
sd.name as punishname
from sys_user f
LEFT JOIN oa_department sd ON sd.DEPARTMENT_ID = f.DEPARTMENT_ID
<foreach item="item" index="index" collection="ids" open="WHERE" separator="or">
<if test=" item != null and item != ''">
USER_ID like CONCAT(CONCAT('%', #{item}),'%')
</if>
</foreach>
</if>
</select>
</mapper>

View File

@ -161,6 +161,9 @@
<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
and f.CORPINFO_ID=#{pd.CORPINFO_ID}
</if>
<if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID != ''"><!-- 关键词检索 -->
and f.OUTSOURCED_ID=#{pd.OUTSOURCED_ID}
</if>
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
@ -259,4 +262,32 @@
SET ISSHOW = (CASE WHEN VIDEOMANAGER_ID = #{VIDEOMANAGER_ID} THEN 1 ELSE 0 END)
where CORPINFO_ID = #{CORPINFO_ID}
</update>
<!-- 列表 -->
<select id="dataApplistPage" parameterType="page" resultType="pd">
select
<include refid="Field"></include>
from
<include refid="tableName"></include> f
where f.ISDELETE = '0'
<if test="pd.OUTSOURCED_ID != null and pd.OUTSOURCED_ID != ''"><!-- 关键词检索 -->
and f.OUTSOURCED_ID=#{pd.OUTSOURCED_ID}
</if>
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
f.VIDEONAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
</select>
<update id="updateAiByOUTSOURCED_ID" parameterType="pd">
update
<include refid="tableName"></include>
set
PLATFORMVIDEOMANAGEMENT_ID = null,
VIDEO_RESOURCES_ID = null
where
OUTSOURCED_ID = #{OUTSOURCED_ID}
</update>
</mapper>