wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity

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

pull/4/head
chenxinying 2024-02-04 17:04:30 +08:00
parent d409db84a2 741d2f1077
commit 945b07d7fd
3 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomCheckRecordController.java
View File

@ -173,7 +173,8 @@ public class CustomCheckRecordController extends BaseController {
List<JSONObject> itemsList = (List<JSONObject>) JSON.parse(pd.get("ITEMS").toString()); List<JSONObject> itemsList = (List<JSONObject>) JSON.parse(pd.get("ITEMS").toString());
for (JSONObject json : itemsList) { for (JSONObject json : itemsList) {
PageData item = new PageData(); PageData item = new PageData();
item.put("RECORDITEM_ID", this.get32UUID()); // 主键 //item.put("RECORDITEM_ID", this.get32UUID()); 主键
item.put("RECORDITEM_ID", json.get("RECORDITEM_ID"));
item.put("CUSTOM_ITEM_ID", json.get("CUSTOM_ITEM_ID")); item.put("CUSTOM_ITEM_ID", json.get("CUSTOM_ITEM_ID"));
PageData chei = customItemService.findById(item); PageData chei = customItemService.findById(item);
item.put("ISNORMAL", json.get("ISNORMAL")); item.put("ISNORMAL", json.get("ISNORMAL"));
@ -1327,22 +1328,27 @@ public class CustomCheckRecordController extends BaseController {
for (JSONObject json : itemsList) { for (JSONObject json : itemsList) {
PageData item = new PageData(); PageData item = new PageData();
item.put("RECORDITEM_ID", json.get("RECORDITEM_ID")); // 主键 item.put("RECORDITEM_ID", json.get("RECORDITEM_ID")); // 主键
item.put("LISTCHECKITEM_ID", json.get("LISTCHECKITEM_ID")); item.put("CUSTOM_ITEM_ID", json.get("CUSTOM_ITEM_ID"));
PageData chei = customItemService.findById(item); PageData chei = customItemService.findById(item);
item.put("ISNORMAL", json.get("ISNORMAL")); item.put("ISNORMAL", json.get("ISNORMAL"));
item.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); item.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID"));
item.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); item.put("CUSTOM_ID", pd.get("CUSTOM_ID"));
item.put("RISKUNITNAME", chei.get("RISKUNITNAME")); item.put("CHECK_CATEGORY", chei.get("CHECK_CATEGORY"));
item.put("PARTSNAME", chei.get("PARTSNAME")); item.put("CHECK_CATEGORY_NAME", chei.get("CHECK_CATEGORY_NAME"));
item.put("RISK_DESCR", chei.get("RISK_DESCR")); item.put("CHECK_ITEM", chei.get("CHECK_ITEM"));
item.put("POSITIONNAME", chei.get("POSITIONNAME")); item.put("CHECK_ITEM_NAME", chei.get("CHECK_ITEM_NAME"));
item.put("LEVEL_NAME", chei.get("DNAME5"));
item.put("CHECK_CONTENT", chei.get("CHECK_CONTENT")); item.put("CHECK_CONTENT", chei.get("CHECK_CONTENT"));
item.put("RISKPOINT_ID", chei.get("RISKPOINT_ID")); item.put("CHECK_STANDARD", chei.get("CHECK_STANDARD"));
item.put("REFERENCE_BASIS", chei.get("REFERENCE_BASIS"));
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("LONGITUDE", pd.get("LONGITUDE"));
item.put("LATITUDE", pd.get("LATITUDE")); item.put("LATITUDE", pd.get("LATITUDE"));
item.put("CORPINFO_ID", pd.get("CORPINFO_ID")); item.put("CORPINFO_ID", pd.get("CORPINFO_ID"));
item.put("ISDELETE", pd.get("0")); item.put("ISDELETE", "0");
item.put("CREATOR_ID", Jurisdiction.getUSER_ID());
item.put("CREATOR_NAME", Jurisdiction.getUsername());
item.put("CREATE_TIME", DateUtil.date2Str(new Date())); //删除时间
customCheckRecordItemService.save(item); customCheckRecordItemService.save(item);
} }

2
src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml
View File

@ -401,7 +401,7 @@
group_concat( group_concat(
IFNULL( bh.USER_NAME, chr.NAME )) IFNULL( bh.USER_NAME, chr.NAME ))
FROM FROM
BUS_CHECKUSER bh bus_hiddendangercheckstandard_checkuser bh
LEFT JOIN sys_user chr ON chr.USER_ID = bh.USER_ID LEFT JOIN sys_user chr ON chr.USER_ID = bh.USER_ID
WHERE WHERE
bh.CHECKRECORD_ID = f.CHECKRECORD_ID bh.CHECKRECORD_ID = f.CHECKRECORD_ID

6
src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml
View File

@ -445,6 +445,12 @@
chd.NAME CHECKDEPTNAME, chd.NAME CHECKDEPTNAME,
lv.NAME HIDDENLEVELNAME, lv.NAME HIDDENLEVELNAME,
bc.LIST_NAME, bc.LIST_NAME,
br.CHECK_CATEGORY_NAME BR_CHECK_CATEGORY_NAME,
br.CHECK_ITEM_NAME BR_CHECK_ITEM_NAME,
br.CHECK_CONTENT BR_CHECK_CONTENT,
br.CHECK_STANDARD BR_CHECK_STANDARD,
br.REFERENCE_BASIS BR_REFERENCE_BASIS,
br.CHECK_RESULT,
Bb.NAME as HIDDEN_CATEGORY_NAME Bb.NAME as HIDDEN_CATEGORY_NAME
from from
<include refid="tableName"></include> f <include refid="tableName"></include> f