Browse Source

增加导出明细功能

java8
赵宏斌 1 month ago
parent
commit
84aad71ec5
  1. 15
      src/main/java/com/xujie/sys/modules/pms/controller/EamController.java
  2. 43
      src/main/java/com/xujie/sys/modules/pms/data/ExportEamPropertiesModelData.java
  3. 2
      src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java
  4. 2
      src/main/java/com/xujie/sys/modules/pms/service/EamService.java
  5. 5
      src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
  6. 57
      src/main/resources/mapper/pms/EamMapper.xml

15
src/main/java/com/xujie/sys/modules/pms/controller/EamController.java

@ -889,6 +889,21 @@ public class EamController {
return R.ok().put("page", page);
}
/**
* @Description TODO
* @Title exportEamPropertiesTemplateAndItem
* @param data
* @author zhb
* @date 2025/12/5
* @return R
* @throw
*/
@PostMapping(value="/exportEamPropertiesTemplateAndItem")
public R exportEamPropertiesTemplateAndItem(@RequestBody EamPropertiesModelHeaderData data){
List<ExportEamPropertiesModelData> list = eamService.exportEamPropertiesTemplateAndItem(data);
return R.ok().put("rows", list).put("total", list.size());
}
/**
* @Description TODO
* @Title eamPropertiesModelEdit

43
src/main/java/com/xujie/sys/modules/pms/data/ExportEamPropertiesModelData.java

@ -0,0 +1,43 @@
package com.xujie.sys.modules.pms.data;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class ExportEamPropertiesModelData {
//维保模板主表 字段
private String site;
private String bu;
private String buNo;
private String buDesc;
private String codeNo;
private String codeDesc;
private String active;
private String isUse;
@DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
private Date createdDate;
private String createdBy;
@DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss", timezone = "GMT+8")
private Date updateDate;
private String updateBy;
//明细表字段
private String itemNo;
private String itemDesc;
private String itemRemark;
private String valueType;
private String valueTypeDb;
private String valueChooseFlag;
private String defaultValue;
private Double maxValue;
private Double minValue;
private Integer orderId;
}

2
src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@ -516,4 +516,6 @@ public interface EamMapper {
List<ExportCoreComponentsData> getAllCoreComponents(EamWorkOrderCoreComponentsData data);
void abandonedEamWorkOrder(EamWorkOrderData data);
List<ExportEamPropertiesModelData> exportEamPropertiesTemplateAndItem(@Param("query")EamPropertiesModelHeaderData data);
}

2
src/main/java/com/xujie/sys/modules/pms/service/EamService.java

@ -1214,4 +1214,6 @@ public interface EamService {
List<ExportCoreComponentsData> getAllCoreComponents(EamWorkOrderCoreComponentsData data);
void abandonedEamWorkOrder(EamWorkOrderData data);
List<ExportEamPropertiesModelData> exportEamPropertiesTemplateAndItem(EamPropertiesModelHeaderData data);
}

5
src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@ -4017,6 +4017,11 @@ public class EamServiceImpl implements EamService {
eamMapper.abandonedEamWorkOrder(data);
}
@Override
public List<ExportEamPropertiesModelData> exportEamPropertiesTemplateAndItem(EamPropertiesModelHeaderData data) {
return eamMapper.exportEamPropertiesTemplateAndItem(data);
}
/**
* 员工考勤vs报工工时
*/

57
src/main/resources/mapper/pms/EamMapper.xml

@ -4065,4 +4065,61 @@
</if>
</where>
</select>
<select id="exportEamPropertiesTemplateAndItem"
resultType="com.xujie.sys.modules.pms.data.ExportEamPropertiesModelData">
SELECT
epmh.site,
epmh.bu_no,
dbo.get_bu_desc(epmh.site, epmh.bu_no) as buDesc,
epmh.code_no,
epmh.code_desc,
epmh.active,
case when epmh.active = 'Y' then '是' when epmh.active = 'N' then '否' else '' end as activeDesc,
epmh.created_date,
epmh.created_by,
dbo.getOperatorDesc(epmh.site, epmh.created_by) as createdByDesc,
epmh.update_date,
epmh.update_by,
dbo.getOperatorDesc(epmh.site, epmh.update_by) as updateByDesc,
CASE WHEN dbo.eam_model_is_use(epmh.site, epmh.function_type, epmh.code_no) > 0 THEN 'Y' else 'N' END as isUse,
a.properties_item_no itemNo,
b.ItemDesc,
b.ItemRemark,
b.ValueType,
b.DefaultValue,
b.MaxValue,
b.MinValue,
b.ValueChooseFlag
FROM eam_properties_model_header epmh
left join eam_properties_model_detail a on a.function_type = epmh.function_type and a.code_no = epmh.code_no and a.site = epmh.site and a.bu_no = epmh.bu_no and a.check_type = epmh.check_type
left join eam_properties_item b on a.function_type = b.itemType and a.properties_item_no = b.itemNo and a.site = b.site and a.bu_no = b.bu_no and a.check_type = b.check_type
<where>
epmh.site in (select site from eam_access_site where username = #{query.userName})
and (epmh.site + '-' + epmh.bu_no) in (select * from dbo.query_bu(#{query.userName}))
and epmh.check_type in (select role_no from access_role where username = #{query.userName})
and epmh.function_type = #{query.functionType}
<if test="query.buDesc != null and query.buDesc != ''">
AND dbo.get_bu_desc ( epmh.site, epmh.bu_no ) = #{query.buDesc}
</if>
<if test="query.codeNo != null and query.codeNo != ''">
AND epmh.code_no like '%' + #{query.codeNo} +'%'
</if>
<if test="query.codeDesc != null and query.codeDesc != ''">
AND epmh.code_desc like '%' + #{query.codeDesc} +'%'
</if>
<if test="query.active != null and query.active != ''">
AND epmh.active = #{query.active}
</if>
<if test='query.isUse != null and query.isUse != "" and query.isUse == "Y"'>
AND dbo.eam_model_is_use(epmh.site, epmh.function_type, epmh.code_no) > 0
</if>
<if test='query.isUse != null and query.isUse != "" and query.isUse == "N"'>
AND dbo.eam_model_is_use(epmh.site, epmh.function_type, epmh.code_no) = 0
</if>
<if test="query.checkType != null and query.checkType != ''">
AND epmh.check_type = #{query.checkType}
</if>
</where>
order by epmh.code_no,a.order_id
</select>
</mapper>
Loading…
Cancel
Save