wilson
/
xujie-sys
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2023-12-15 模板增加字段：当前模板是否存在维保计划，并且维保计划的“结束时间>=当天”

java8
fengyuan_yang 2 years ago
parent
7b47aead9f
commit
6972aa5bcb
3 changed files with 196 additions and 178 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/main/java/com/xujie/sys/modules/pms/data/EamPropertiesModelHeaderData.java
  2. 15
      src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
  3. 349
      src/main/resources/mapper/pms/EamMapper.xml

10
src/main/java/com/xujie/sys/modules/pms/data/EamPropertiesModelHeaderData.java
View File

@ -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;

15
src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
View File

@ -556,8 +556,7 @@ public class EamServiceImpl implements EamService {
//---------------点检模板-------------------
@Override
public PageUtils eamPropertiesModelSearch(EamPropertiesModelHeaderData inData){
IPage<EamPropertiesModelHeaderData> resultList = this.eamMapper.eamPropertiesModelSearch(
new Page<EamPropertiesModelHeaderData>(inData.getPage(), inData.getLimit()), inData);
IPage<EamPropertiesModelHeaderData> resultList = this.eamMapper.eamPropertiesModelSearch(new Page<EamPropertiesModelHeaderData>(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("短信发送失败!");
}

349
src/main/resources/mapper/pms/EamMapper.xml
View File

@ -83,212 +83,212 @@
</select>
<select id="eamFamilySearch" parameterType="com.xujie.sys.modules.pms.data.EamFamilyData" resultType="com.xujie.sys.modules.pms.data.EamFamilyData">
SELECT
Site,
FamilyID,
FamilyDesc,
Active,
create_date,
create_by,
update_date,
update_by
FROM eam_family
<where>
<if test="query.site != null and query.site != ''">
AND site = #{query.site}
</if>
<if test="query.familyID != null and query.familyID != ''">
AND familyID like '%' + #{query.familyID} +'%'
</if>
<if test="query.familyDesc != null and query.familyDesc != ''">
AND familyDesc like '%' + #{query.familyDesc} +'%'
</if>
<if test="query.active != null and query.active != ''">
AND active = #{query.active}
</if>
</where>
</select>
<select id="eamGroupSearch" parameterType="com.xujie.sys.modules.pms.data.EamGroupData" resultType="com.xujie.sys.modules.pms.data.EamGroupData">
SELECT
Site,
GroupID,
GroupDesc,
Active,
create_date,
create_by,
update_date,
update_by
FROM eam_group
<where>
<if test="query.site != null and query.site != ''">
AND site = #{query.site}
</if>
<if test="query.groupID != null and query.groupID != ''">
AND groupID like '%' + #{query.groupID}
</if>
<if test="query.groupDesc != null and query.groupDesc != ''">
AND groupDesc like '%' + #{query.groupDesc}
</if>
<if test="query.active != null and query.active != ''">
AND active = #{query.active}
</if>
</where>
</select>
<select id="eamLocationSearch" parameterType="com.xujie.sys.modules.pms.data.EamLocationData" resultType="com.xujie.sys.modules.pms.data.EamLocationData">
SELECT
Site,
LocationID,
LocationName,
Active,
create_date,
create_by,
update_date,
update_by
FROM eam_location
<where>
<if test="query.site != null and query.site != ''">
AND site = #{query.site}
</if>
<if test="query.locationID != null and query.locationID != ''">
AND locationID like '%' + #{query.locationID} +'%'
</if>
<if test="query.locationName != null and query.locationName != ''">
AND locationName like '%' + #{query.locationName} +'%'
</if>
<if test="query.active != null and query.active != ''">
AND active = #{query.active}
</if>
</where>
</select>
<select id="eamFamilySearch" parameterType="com.xujie.sys.modules.pms.data.EamFamilyData" resultType="com.xujie.sys.modules.pms.data.EamFamilyData">
SELECT
Site,
FamilyID,
FamilyDesc,
Active,
create_date,
create_by,
update_date,
update_by
FROM eam_family
<where>
<if test="query.site != null and query.site != ''">
AND site = #{query.site}
</if>
<if test="query.familyID != null and query.familyID != ''">
AND familyID like '%' + #{query.familyID} +'%'
</if>
<if test="query.familyDesc != null and query.familyDesc != ''">
AND familyDesc like '%' + #{query.familyDesc} +'%'
</if>
<if test="query.active != null and query.active != ''">
AND active = #{query.active}
</if>
</where>
</select>
<select id="eamManufacturerSearch" parameterType="com.xujie.sys.modules.pms.data.EamManufacturerData" resultType="com.xujie.sys.modules.pms.data.EamManufacturerData">
<select id="eamGroupSearch" parameterType="com.xujie.sys.modules.pms.data.EamGroupData" resultType="com.xujie.sys.modules.pms.data.EamGroupData">
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
<where>
<if test="query.site != null and query.site != ''">
<if test="query.site != null and query.site != ''">
AND site = #{query.site}
</if>
<if test="query.manufacturerID != null and query.manufacturerID != ''">
AND manufacturerID like '%' + #{query.manufacturerID} +'%'
<if test="query.groupID != null and query.groupID != ''">
AND groupID like '%' + #{query.groupID}
</if>
<if test="query.manufacturerName != null and query.manufacturerName != ''">
AND manufacturerName like '%' + #{query.manufacturerName} +'%'
<if test="query.groupDesc != null and query.groupDesc != ''">
AND groupDesc like '%' + #{query.groupDesc}
</if>
<if test="query.active != null and query.active != ''">
<if test="query.active != null and query.active != ''">
AND active = #{query.active}
</if>
</where>
</select>
</select>
<select id="eamAdminLevelSearch" parameterType="com.xujie.sys.modules.pms.data.EamAdminLevelData" resultType="com.xujie.sys.modules.pms.data.EamAdminLevelData">
SELECT
Site,
AdminLevelID,
AdminLevelDesc,
Active,
create_date,
create_by,
update_date,
update_by
FROM eam_adminLevel
<where>
<if test="query.site != null and query.site != ''">
AND site = #{query.site}
</if>
<if test="query.adminLevelID != null and query.adminLevelID != ''">
AND adminLevelID like '%' + #{query.adminLevelID} +'%'
</if>
<if test="query.adminLevelDesc != null and query.adminLevelDesc != ''">
AND adminLevelDesc like '%' + #{query.adminLevelDesc}+'%'
</if>
<if test="query.active != null and query.active != ''">
AND active = #{query.active}
</if>
</where>
</select>
<select id="eamSupplierSearch" parameterType="com.xujie.sys.modules.pms.data.EamSupplierData" resultType="com.xujie.sys.modules.pms.data.EamSupplierData">
<select id="eamLocationSearch" parameterType="com.xujie.sys.modules.pms.data.EamLocationData" resultType="com.xujie.sys.modules.pms.data.EamLocationData">
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
<where>
<if test="query.site != null and query.site != ''">
<if test="query.site != null and query.site != ''">
AND site = #{query.site}
</if>
<if test="query.supplierID != null and query.supplierID != ''">
AND supplierID like '%' + #{query.supplierID} +'%'
<if test="query.locationID != null and query.locationID != ''">
AND locationID like '%' + #{query.locationID} +'%'
</if>
<if test="query.supplierName != null and query.supplierName != ''">
AND supplierName like '%' + #{query.supplierName} +'%'
<if test="query.locationName != null and query.locationName != ''">
AND locationName like '%' + #{query.locationName} +'%'
</if>
<if test="query.active != null and query.active != ''">
<if test="query.active != null and query.active != ''">
AND active = #{query.active}
</if>
</where>
</select>
</select>
<select id="searchItemAvailable" resultType="com.xujie.sys.modules.pms.data.EamPropertiesItemAvailableData">
SELECT
site,
ItemNo,
ValueNo,
AvailableValue,
CreatedDate,
CreatedBy,
ItemType
from eam_properties_item_available
where itemNo = #{itemNo} and ItemType = #{itemType} and site = #{site}
</select>
<select id="eamManufacturerSearch" parameterType="com.xujie.sys.modules.pms.data.EamManufacturerData" resultType="com.xujie.sys.modules.pms.data.EamManufacturerData">
SELECT
Site,
ManufacturerID,
ManufacturerName,
Active,
Contact,
Phone,
Address,
Email,
Remark,
create_date,
create_by,
update_date,
update_by
FROM eam_manufacturer
<where>
<if test="query.site != null and query.site != ''">
AND site = #{query.site}
</if>
<if test="query.manufacturerID != null and query.manufacturerID != ''">
AND manufacturerID like '%' + #{query.manufacturerID} +'%'
</if>
<if test="query.manufacturerName != null and query.manufacturerName != ''">
AND manufacturerName like '%' + #{query.manufacturerName} +'%'
</if>
<if test="query.active != null and query.active != ''">
AND active = #{query.active}
</if>
</where>
</select>
<select id="eamAdminLevelSearch" parameterType="com.xujie.sys.modules.pms.data.EamAdminLevelData" resultType="com.xujie.sys.modules.pms.data.EamAdminLevelData">
SELECT
Site,
AdminLevelID,
AdminLevelDesc,
Active,
create_date,
create_by,
update_date,
update_by
FROM eam_adminLevel
<where>
<if test="query.site != null and query.site != ''">
AND site = #{query.site}
</if>
<if test="query.adminLevelID != null and query.adminLevelID != ''">
AND adminLevelID like '%' + #{query.adminLevelID} +'%'
</if>
<if test="query.adminLevelDesc != null and query.adminLevelDesc != ''">
AND adminLevelDesc like '%' + #{query.adminLevelDesc}+'%'
</if>
<if test="query.active != null and query.active != ''">
AND active = #{query.active}
</if>
</where>
</select>
<select id="eamSupplierSearch" parameterType="com.xujie.sys.modules.pms.data.EamSupplierData" resultType="com.xujie.sys.modules.pms.data.EamSupplierData">
SELECT
Site,
SupplierID,
SupplierName,
[Group],
Active,
Contact,
Phone,
Address,
Email,
Remark,
create_date,
create_by,
update_date,
update_by
FROM eam_supplier
<where>
<if test="query.site != null and query.site != ''">
AND site = #{query.site}
</if>
<if test="query.supplierID != null and query.supplierID != ''">
AND supplierID like '%' + #{query.supplierID} +'%'
</if>
<if test="query.supplierName != null and query.supplierName != ''">
AND supplierName like '%' + #{query.supplierName} +'%'
</if>
<if test="query.active != null and query.active != ''">
AND active = #{query.active}
</if>
</where>
</select>
<select id="getItemValueNo" resultType="Double">
SELECT isnull( max(valueNo),0)+1 from eam_properties_item_available where itemNo = #{itemNo} and ItemType = #{itemType} and site = #{site}
</select>
<select id="getItemValueNoForPlan" resultType="Double">
SELECT isnull( max(valueNo),0)+1 from eam_workPlan_item_available where itemNo=#{itemNo} and ItemType=#{itemType} and site=#{site} and PlanID=#{planID}
</select>
<insert id="saveItemAvailable">
insert into eam_properties_item_available (ItemNo,ValueNo,AvailableValue,CreatedDate,CreatedBy,ItemType,site)
values(#{itemNo},#{valueNo},#{availableValue},GetDate(),#{createdBy},#{itemType},#{site})
</insert>
<select id="searchItemAvailable" resultType="com.xujie.sys.modules.pms.data.EamPropertiesItemAvailableData">
SELECT
site,
ItemNo,
ValueNo,
AvailableValue,
CreatedDate,
CreatedBy,
ItemType
from eam_properties_item_available
where itemNo = #{itemNo} and ItemType = #{itemType} and site = #{site}
</select>
<update id="updateItemAvailable">
update eam_properties_item_available set AvailableValue = #{availableValue} where itemNo = #{itemNo} and ItemType = #{itemType} and ValueNo = #{valueNo} and site = #{site}
</update>
<delete id="deleteItemAvailable">
delete from eam_properties_item_available where itemNo = #{itemNo} and ItemType = #{itemType} and ValueNo = #{valueNo} and site = #{site}
</delete>
<select id="getItemValueNo" resultType="Double">
SELECT isnull( max(valueNo),0)+1 from eam_properties_item_available where itemNo = #{itemNo} and ItemType = #{itemType} and site = #{site}
</select>
<select id="getItemValueNoForPlan" resultType="Double">
SELECT isnull( max(valueNo),0)+1 from eam_workPlan_item_available where itemNo=#{itemNo} and ItemType=#{itemType} and site=#{site} and PlanID=#{planID}
</select>
<insert id="saveItemAvailable">
insert into eam_properties_item_available (ItemNo,ValueNo,AvailableValue,CreatedDate,CreatedBy,ItemType,site)
values(#{itemNo},#{valueNo},#{availableValue},GetDate(),#{createdBy},#{itemType},#{site})
</insert>
<select id="eamPropertiesModelSearch" parameterType="com.xujie.sys.modules.pms.data.EamPropertiesModelHeaderData" resultType="com.xujie.sys.modules.pms.data.EamPropertiesModelHeaderData">
<update id="updateItemAvailable">
update eam_properties_item_available set AvailableValue = #{availableValue} where itemNo = #{itemNo} and ItemType = #{itemType} and ValueNo = #{valueNo} and site = #{site}
</update>
<delete id="deleteItemAvailable">
delete from eam_properties_item_available where itemNo = #{itemNo} and ItemType = #{itemType} and ValueNo = #{valueNo} and site = #{site}
</delete>
<select id="eamPropertiesModelSearch" parameterType="com.xujie.sys.modules.pms.data.EamPropertiesModelHeaderData" resultType="com.xujie.sys.modules.pms.data.EamPropertiesModelHeaderData">
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
<where>
site = #{query.site}
@ -313,9 +316,15 @@
<if test="query.active != null and query.active != ''">
AND active = #{query.active}
</if>
<if test='query.isUse != null and query.isUse != "" and query.isUse == "Y"'>
AND dbo.eam_model_is_use(site, function_type, code_no) > 0
</if>
<if test='query.isUse != null and query.isUse != "" and query.isUse == "N"'>
AND dbo.eam_model_is_use(site, function_type, code_no) = 0
</if>
and function_type = #{query.functionType}
</where>
</select>
</select>
<insert id="eamPropertiesModelSave" >
insert into eam_properties_model_header

Write Preview
Loading…
Cancel
Save