diff --git a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomCheckRecordController.java b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomCheckRecordController.java index 20f6604..ed94e04 100644 --- a/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomCheckRecordController.java +++ b/src/main/java/com/zcloud/controller/hiddenDangerCheckStandard/CustomCheckRecordController.java @@ -173,7 +173,8 @@ public class CustomCheckRecordController extends BaseController { List itemsList = (List) JSON.parse(pd.get("ITEMS").toString()); for (JSONObject json : itemsList) { 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")); PageData chei = customItemService.findById(item); item.put("ISNORMAL", json.get("ISNORMAL")); @@ -1327,22 +1328,27 @@ public class CustomCheckRecordController extends BaseController { for (JSONObject json : itemsList) { PageData item = new PageData(); 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); item.put("ISNORMAL", json.get("ISNORMAL")); item.put("CHECKRECORD_ID", pd.get("CHECKRECORD_ID")); - item.put("LISTMANAGER_ID", pd.get("LISTMANAGER_ID")); - item.put("RISKUNITNAME", chei.get("RISKUNITNAME")); - item.put("PARTSNAME", chei.get("PARTSNAME")); - item.put("RISK_DESCR", chei.get("RISK_DESCR")); - item.put("POSITIONNAME", chei.get("POSITIONNAME")); - item.put("LEVEL_NAME", chei.get("DNAME5")); + item.put("CUSTOM_ID", pd.get("CUSTOM_ID")); + item.put("CHECK_CATEGORY", chei.get("CHECK_CATEGORY")); + item.put("CHECK_CATEGORY_NAME", chei.get("CHECK_CATEGORY_NAME")); + item.put("CHECK_ITEM", chei.get("CHECK_ITEM")); + item.put("CHECK_ITEM_NAME", chei.get("CHECK_ITEM_NAME")); 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("LATITUDE", pd.get("LATITUDE")); 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); } diff --git a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml index 63e30be..d1c6bfc 100644 --- a/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml +++ b/src/main/resources/mybatis/datasource/check/CheckRecordMapper.xml @@ -401,7 +401,7 @@ group_concat( IFNULL( bh.USER_NAME, chr.NAME )) FROM - BUS_CHECKUSER bh + bus_hiddendangercheckstandard_checkuser bh LEFT JOIN sys_user chr ON chr.USER_ID = bh.USER_ID WHERE bh.CHECKRECORD_ID = f.CHECKRECORD_ID diff --git a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml index ef742b9..3057a7e 100644 --- a/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml +++ b/src/main/resources/mybatis/datasource/hiddenDangerCheckStandard/CustomHiddenMapper.xml @@ -445,6 +445,12 @@ chd.NAME CHECKDEPTNAME, lv.NAME HIDDENLEVELNAME, 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 from f