diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamPropertiesModelHeaderData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamPropertiesModelHeaderData.java index 17571882..84c0631d 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/EamPropertiesModelHeaderData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/EamPropertiesModelHeaderData.java @@ -29,6 +29,16 @@ public class EamPropertiesModelHeaderData extends QueryPage { private String itemNo; // 项目名称 private String itemDesc; + // 模板是否被用 + private String isUse; + + public String getIsUse() { + return isUse; + } + + public void setIsUse(String isUse) { + this.isUse = isUse; + } public String getItemNo() { return itemNo; diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index d85bfe43..fe21d52f 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java @@ -556,8 +556,7 @@ public class EamServiceImpl implements EamService { //---------------点检模板------------------- @Override public PageUtils eamPropertiesModelSearch(EamPropertiesModelHeaderData inData){ - IPage resultList = this.eamMapper.eamPropertiesModelSearch( - new Page(inData.getPage(), inData.getLimit()), inData); + IPage resultList = this.eamMapper.eamPropertiesModelSearch(new Page(inData.getPage(), inData.getLimit()), inData); return new PageUtils(resultList); } @@ -1592,8 +1591,8 @@ public class EamServiceImpl implements EamService { String content = feedBackData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + feedBackData.getFeedBackDesc() +" 故障,请及时处理!【齐克庞德】"; try { // 发送短信 - int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, ""); - //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, ""); + //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, ""); + int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, ""); if (code <= 0) { throw new RuntimeException("短信发送失败!"); } @@ -1742,8 +1741,8 @@ public class EamServiceImpl implements EamService { String content = feedBackData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + feedBackData.getFeedBackDesc() +" 故障,请及时处理!【齐克庞德】"; try { // 发送短信 - int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, ""); - //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, ""); + //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, ""); + int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, ""); if (code <= 0) { throw new RuntimeException("短信发送失败!"); } @@ -2522,8 +2521,8 @@ public class EamServiceImpl implements EamService { String content = inData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + inData.getFeedBackDesc() +" 故障,请及时处理!【齐克庞德】"; try { // 发送短信 - int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, ""); - //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, ""); + //int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, ""); + int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, ""); if (code <= 0){ throw new RuntimeException("短信发送失败!"); } diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index cbf4bc67..5c93b67c 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -83,212 +83,212 @@ - - - - - + - SELECT Site, - ManufacturerID, - ManufacturerName, + GroupID, + GroupDesc, Active, - Contact, - Phone, - Address, - Email, - Remark, create_date, create_by, update_date, update_by - FROM eam_manufacturer + FROM eam_group - + AND site = #{query.site} - - AND manufacturerID like '%' + #{query.manufacturerID} +'%' + + AND groupID like '%' + #{query.groupID} - - AND manufacturerName like '%' + #{query.manufacturerName} +'%' + + AND groupDesc like '%' + #{query.groupDesc} - + AND active = #{query.active} - + - - SELECT Site, - SupplierID, - SupplierName, - [Group], + LocationID, + LocationName, Active, - Contact, - Phone, - Address, - Email, - Remark, create_date, create_by, update_date, update_by - FROM eam_supplier + FROM eam_location - + AND site = #{query.site} - - AND supplierID like '%' + #{query.supplierID} +'%' + + AND locationID like '%' + #{query.locationID} +'%' - - AND supplierName like '%' + #{query.supplierName} +'%' + + AND locationName like '%' + #{query.locationName} +'%' - + AND active = #{query.active} - + - + + + - - - - insert into eam_properties_item_available (ItemNo,ValueNo,AvailableValue,CreatedDate,CreatedBy,ItemType,site) - values(#{itemNo},#{valueNo},#{availableValue},GetDate(),#{createdBy},#{itemType},#{site}) - + - - update eam_properties_item_available set AvailableValue = #{availableValue} where itemNo = #{itemNo} and ItemType = #{itemType} and ValueNo = #{valueNo} and site = #{site} - - - delete from eam_properties_item_available where itemNo = #{itemNo} and ItemType = #{itemType} and ValueNo = #{valueNo} and site = #{site} - + + + + insert into eam_properties_item_available (ItemNo,ValueNo,AvailableValue,CreatedDate,CreatedBy,ItemType,site) + values(#{itemNo},#{valueNo},#{availableValue},GetDate(),#{createdBy},#{itemType},#{site}) + - SELECT site, function_type, @@ -300,7 +300,10 @@ update_date, update_by, delflag, - version + version, + CASE WHEN dbo.eam_model_is_use(site, function_type, code_no) > 0 THEN 'Y' + else 'N' + END as isUse FROM eam_properties_model_header site = #{query.site} @@ -313,9 +316,15 @@ AND active = #{query.active} + + AND dbo.eam_model_is_use(site, function_type, code_no) > 0 + + + AND dbo.eam_model_is_use(site, function_type, code_no) = 0 + and function_type = #{query.functionType} - + insert into eam_properties_model_header