jks

cement-business/pom.xml

@@ -230,19 +230,22 @@
                 <directory>src/main/resources</directory>
                 <filtering>true</filtering>
                 <includes>
-                    <include>*.xlsx</include>
+                    <!--<include>*.xlsx</include>-->
                     <include>*</include>
                 </includes>
             </resource>
 
-            <resource>
+            <!--<resource>
                 <directory>src/main/resources/templates</directory>
                 <filtering>true</filtering>
                 <includes>
                     <include>*</include>
                 </includes>
                 <targetPath>/templates</targetPath>
-            </resource>
+            </resource>-->
+
+
+
             <resource>
                 <directory>src/main/java/cn/wise/sc/cement/business/mapper/xml</directory>
                 <filtering>true</filtering>

cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanConsumablesPurchase.java

@@ -2,10 +2,12 @@ package cn.wise.sc.cement.business.entity;
 
 import java.math.BigDecimal;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 
 import java.time.LocalDate;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.time.LocalDateTime;
@@ -41,24 +43,31 @@ public class PlanConsumablesPurchase implements Serializable {
 	private String name;
 
 	@ApiModelProperty("规格型号")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String model;
 
 	@ApiModelProperty("技术指标")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String technicalIndex;
 
 	@ApiModelProperty("单价（万元）")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private BigDecimal unitPrice;
 
 	@ApiModelProperty("生产单位")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String productionUnit;
 
 	@ApiModelProperty("采购数量")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Integer purchaseNum;
 
 	@ApiModelProperty("采购日期（购买日期）")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private LocalDate purchaseDate;
 
 	@ApiModelProperty("采购人id")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Integer purchaserId;
 
 	@ApiModelProperty("创建人id")
@@ -68,6 +77,7 @@ public class PlanConsumablesPurchase implements Serializable {
 	private Integer status;
 
 	@ApiModelProperty("实施情况")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String implementation;
 
 	@ApiModelProperty("创建时间")

cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanEquipmentMaintain.java

 package cn.wise.sc.cement.business.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.time.LocalDate;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
@@ -39,24 +37,30 @@ public class PlanEquipmentMaintain implements Serializable {
 	private String name;
 
 	@ApiModelProperty("规格型号")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String model;
 
 	@ApiModelProperty("编号")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String code;
 
 	@ApiModelProperty("维护日期")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private LocalDate maintainDate;
 
 	@ApiModelProperty("创建人id")
 	private Integer userId;
 
 	@ApiModelProperty("设备维护人id")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Integer maintainerId;
 
 	@ApiModelProperty("维护内容")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String maintainContent;
 
 	@ApiModelProperty("维护结果")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String maintainResult;
 
 	@ApiModelProperty("设备维护计划附件地址")

cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanEquipmentPurchase.java

@@ -2,10 +2,12 @@ package cn.wise.sc.cement.business.entity;
 
 import java.math.BigDecimal;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 
 import java.time.LocalDate;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.time.LocalDateTime;
@@ -41,24 +43,31 @@ public class PlanEquipmentPurchase implements Serializable {
 	private String name;
 
 	@ApiModelProperty("规格型号")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String model;
 
 	@ApiModelProperty("技术指标")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String technicalIndex;
 
 	@ApiModelProperty("单价（万元）")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private BigDecimal unitPrice;
 
 	@ApiModelProperty("生产单位")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String productionUnit;
 
 	@ApiModelProperty("采购数量")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Integer purchaseNum;
 
 	@ApiModelProperty("采购日期（购买日期）")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private LocalDate purchaseDate;
 
 	@ApiModelProperty("采购人id")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Integer purchaserId;
 
 	@ApiModelProperty("创建人id")
@@ -68,6 +77,7 @@ public class PlanEquipmentPurchase implements Serializable {
 	private Integer status;
 
 	@ApiModelProperty("实施情况")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String implementation;
 
 	@ApiModelProperty("创建时间")

cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanEquipmentRepair.java

@@ -2,10 +2,12 @@ package cn.wise.sc.cement.business.entity;
 
 import java.math.BigDecimal;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 
 import java.time.LocalDate;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.time.LocalDateTime;
@@ -41,30 +43,37 @@ public class PlanEquipmentRepair implements Serializable {
 	private String name;
 
 	@ApiModelProperty("规格型号")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String model;
 
 	@ApiModelProperty("技术指标")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String technicalIndex;
 
 	@ApiModelProperty("单价（万元）")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private BigDecimal unitPrice;
 
 	@ApiModelProperty("生产单位")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String productionUnit;
 
 	@ApiModelProperty("维修日期")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private LocalDate repairDate;
 
 	@ApiModelProperty("创建人id")
 	private Integer userId;
 
 	@ApiModelProperty("维修人id")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Integer repairerId;
 
 	@ApiModelProperty("状态（0待完成，1已完成）")
 	private Integer status;
 
 	@ApiModelProperty("实施情况")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String implementation;
 
 	@ApiModelProperty("创建时间")

cement-business/src/main/java/cn/wise/sc/cement/business/entity/PlanStandardPurchase.java

 package cn.wise.sc.cement.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 
 import java.time.LocalDate;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 
 import java.time.LocalDateTime;
@@ -39,30 +41,37 @@ public class PlanStandardPurchase implements Serializable {
 	private String name;
 
 	@ApiModelProperty("标物编号")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String code;
 
 	@ApiModelProperty("经销单位")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String distributionUnit;
 
 	@ApiModelProperty("采购数量")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Integer purchaseNum;
 
 	@ApiModelProperty("采购日期（购买日期）")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private LocalDate purchaseDate;
 
 	@ApiModelProperty("采购人id")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private Integer purchaserId;
 
 	@ApiModelProperty("创建人id")
 	private Integer userId;
 
 	@ApiModelProperty("规格型号")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String model;
 
 	@ApiModelProperty("状态（0禁用，1已启用）")
 	private Integer status;
 
 	@ApiModelProperty("实施情况")
+	@TableField(fill = FieldFill.INSERT_UPDATE)
 	private String implementation;
 
 	@ApiModelProperty("创建时间")

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/ClientMapper.xml

@@ -28,10 +28,10 @@
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        t.name as 单位名称,
-        t.principal as 联系人,
-        t.principal_phone as 联系电话,
-        t.region as 所在地区,
+        IF(ISNULL(t.name),'',t.name)  as 单位名称,
+        IF(ISNULL(t.principal),'',t.principal)  as 联系人,
+        IF(ISNULL(t.principal_phone),'',t.principal_phone)  as 联系电话,
+        IF(ISNULL(t.region),'',t.region) as 所在地区,
         (select count(*) from project p where p.client_id = t.id) as 项目数,
         (
         CASE t.status

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/ConsumablesMapper.xml

@@ -25,12 +25,12 @@
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        t.name as 易耗品名称,
-        t.code as '易耗品代号',
-        s.name as 供应商,
-        t.position as 位置,
-        t.purchase_date as 购买日期,
-        t.stock_num as 库存数量
+        IF(ISNULL(t.name),'',t.name)  as 易耗品名称,
+        IF(ISNULL(t.code),'',t.code)  as '易耗品代号',
+        IF(ISNULL(s.name),'',s.name)  as 供应商,
+        IF(ISNULL(t.position),'',t.position)  as 位置,
+        IF(ISNULL(t.purchase_date),'',t.purchase_date)  as 购买日期,
+        IF(ISNULL(t.stock_num),'',t.stock_num) as 库存数量
         FROM consumables t
         left join supplier s on s.id = t.supplier_id
         ,(select @i:=0)t

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/DataStatisticsMapper.xml

@@ -185,11 +185,11 @@
     <select id="exportEntrustList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        e.id as entrustId,
+        IF(ISNULL(e.id),'',e.id)   as entrustId,
         IF(ISNULL(e.entrust_code),'',e.entrust_code) as 委托单号,
         IF(ISNULL(p.name),'',p.name) as 项目名称,
         IF(ISNULL(p.name),'',p.name)  as 项目编号,
-        e.project_type as 项目类型,
+        IF(ISNULL(e.project_type),'',e.project_type)   as 项目类型,
         IF(ISNULL(su.name),'',su.name) as 委托人,
         IF(ISNULL(c.name),'',c.name) as 委托单位,
         IF(ISNULL(e.entrust_date),'',e.entrust_date)  as 委托日期,
@@ -353,7 +353,10 @@
     </select>
 
     <select id="exportTeamList" resultType="java.util.HashMap">
-        SELECT (@i:=@i+1) as 序号,t.id as id, t.name as 检测项目, count(*) as 检测项数量
+        SELECT (@i:=@i+1) as 序号,
+        t.id as id,
+        t.name as 检测项目,
+        count(*) as 检测项数量
         FROM sample_distribution sd
         left join team t on t.id = sd.team_id
         ,(select @i:=0)t

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EquipmentMapper.xml

@@ -43,14 +43,14 @@
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        t.name as 设备名称,
-        t.code as 设备编号,
-        et.name as 设备分类,
-        t.brand as 设备品牌,
-        t.model as '规格/型号',
-        s.name as 供应商,
-        t.position as 位置,
-        t.purchase_date as 购买日期
+        IF(ISNULL(t.name),'',t.name)  as 设备名称,
+        IF(ISNULL(t.code),'',t.code) as 设备编号,
+        IF(ISNULL(et.name),'',et.name) as 设备分类,
+        IF(ISNULL(t.brand),'',t.brand) as 设备品牌,
+        IF(ISNULL(t.model),'',t.model) as '规格/型号',
+        IF(ISNULL(s.name),'',s.name) as 供应商,
+        IF(ISNULL(t.position),'',t.position) as 位置,
+        IF(ISNULL(t.purchase_date),'',t.purchase_date) as 购买日期
         FROM equipment t
         left join supplier s on s.id = t.supplier_id
         left join equipment_type et on et.id = t.type
@@ -61,9 +61,9 @@
     <select id="exportTestList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        t.name as 设备名称,
-        t.code as 设备编号,
-        t.model as '规格/型号',
+        IF(ISNULL(t.name),'',t.name) as 设备名称,
+        IF(ISNULL(t.code),'',t.code) as 设备编号,
+        IF(ISNULL(t.model),'',t.model) as '规格/型号',
         IF(ISNULL(t.test_cycle),'',t.test_cycle) as '检/校周期',
         IF(ISNULL(t.test_date),'',t.test_date) as 检定日期,
         IF(ISNULL(t.check_date),'',t.check_date) as 校检日期 ,

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EquipmentScrapMapper.xml

@@ -31,9 +31,9 @@
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        e.name as 设备名称,
-        e.code as 设备编号,
-        e.model as '规格/型号',
+        IF(ISNULL(e.name),'',e.name) as 设备名称,
+        IF(ISNULL(e.code),'',e.code) as 设备编号,
+        IF(ISNULL(e.model),'',e.model) as '规格/型号',
         IF(ISNULL(e.purchase_date),'',e.purchase_date) as 购置日期,
         IF(ISNULL(e.assets_value),'',e.assets_value) as 设备原值,
         IF(ISNULL(es.scrap_reason),'',es.scrap_reason) as 报废原因,

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EquipmentTroubleshootingMapper.xml

@@ -22,9 +22,9 @@
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        e.name as 设备名称,
-        e.code as 设备编号,
-        e.model as '规格/型号',
+        IF(ISNULL(e.name),'',e.name)  as 设备名称,
+        IF(ISNULL(e.code),'',e.code)  as 设备编号,
+        IF(ISNULL(e.model),'',e.model)  as '规格/型号',
         IF(ISNULL(et.find_date),'',et.find_date) as 发现日期,
         IF(ISNULL(et.find_user),'',et.find_user) as 发现人,
         IF(ISNULL(et.fault_phenomenon),'',et.fault_phenomenon) as 故障描述,

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/EquipmentUseMapper.xml

@@ -31,9 +31,9 @@
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        e.name as 设备名称,
-        e.code as 设备编号,
-        e.model as '规格/型号',
+        IF(ISNULL(e.name),'',e.name)  as 设备名称,
+        IF(ISNULL(e.code),'',e.code)  as 设备编号,
+        IF(ISNULL(e.model),'',e.model)  as '规格/型号',
         IF(ISNULL(eu.use_date),'',eu.use_date) as 使用日期,
         IF(ISNULL(eu.user_name),'',eu.user_name) as 使用人,
         IF(ISNULL(eu.project_name),'',eu.project_name) as 参与项目,

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardApplyMapper.xml

@@ -42,18 +42,18 @@
 
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
-        na.id as 序号,
-        su.name as 姓名,
-        su.username as 账户,
-        na.statistical as 起止日期,
-        na.reported_hours as 上报工日,
+        IF(ISNULL(na.id),'',na.id)  as 序号,
+        IF(ISNULL(su.name),'',su.name)  as 姓名,
+        IF(ISNULL(su.username),'',su.username)  as 账户,
+        IF(ISNULL(na.statistical),'',na.statistical)  as 起止日期,
+        IF(ISNULL(tna.reported_hours),'',na.reported_hours) as 上报工日,
         (
         CASE na.status
         WHEN 0 THEN '未申请'
         WHEN 1 THEN '待审批'
         WHEN 2 THEN '已通过'
         WHEN 3 THEN '未通过'
-        ELSE NULL
+        ELSE ''
         END
         )as 状态,
         na.work_type as 工作类别,

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardApprovalMapper.xml

@@ -45,12 +45,12 @@
 
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
-        na.id as 序号,
-        su.name as 姓名,
-        su.username as 账户,
-        na.statistical as 起止日期,
-        na.reported_hours as 上报工日,
-        na.approval_hours as 审批工日,
+        IF(ISNULL(na.id),'',na.id)  as 序号,
+        IF(ISNULL(su.name),'',su.name)  as 姓名,
+        IF(ISNULL(su.username),'',su.username)  as 账户,
+        IF(ISNULL(na.statistical),'',na.statistical)   as 起止日期,
+        IF(ISNULL(na.reported_hours),'',na.reported_hours)  as 上报工日,
+        IF(ISNULL(na.approval_hours),'',na.approval_hours)  as 审批工日,
         (
         CASE na.status
         WHEN 0 THEN '未提交'
@@ -59,8 +59,8 @@
         ELSE '已通过'
         END
         )as 状态,
-        na.final_value as 最终产值,
-        na.final_rejection as 驳回意见
+        IF(ISNULL(na.final_value),'',na.final_value)  as 最终产值,
+        IF(ISNULL(na.final_rejection),'',na.final_rejection)  as 驳回意见
         FROM nonstandard_apply na
         left join sys_user su on na.user_id = su.id
         <include refid="where"/>

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/NonStandardValueMapper.xml

@@ -51,17 +51,17 @@
 <!--    </select>-->
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
-        na.id as 序号,
-        su.name as 姓名,
-        su.username as 账户,
-        na.statistical as 起止日期,
-        na.reported_hours as 上报工日,
-        na.approval_hours as 审批工日,
-        na.final_value as 最终产值,
-        na.work_type as 工作类别,
-        na.work_description as 工作描述,
-        su.group_id as 部门id,
-        sg.name as 部门名
+        IF(ISNULL(na.id),'',na.id)  as 序号,
+        IF(ISNULL(su.name),'',su.name) su.name as 姓名,
+        IF(ISNULL(su.username),'',su.username)  as 账户,
+        IF(ISNULL(na.statistical),'',na.statistical)  as 起止日期,
+        IF(ISNULL(na.reported_hours),'',na.reported_hours)  as 上报工日,
+        IF(ISNULL(na.approval_hours),'',na.approval_hours)  as 审批工日,
+        IF(ISNULL(na.final_value),'',na.final_value)  as 最终产值,
+        IF(ISNULL(na.work_type),'',na.work_type)  as 工作类别,
+        IF(ISNULL(na.work_description),'',na.work_description)  as 工作描述,
+        IF(ISNULL(su.group_id),'',su.group_id)  as 部门id,
+        IF(ISNULL(sg.name),'',sg.name)  as 部门名
         FROM nonstandard_apply na
         left join sys_user su on na.user_id = su.id
         LEFT JOIN sys_group sg ON sg.id = su.group_id

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanConsumablesPurchaseMapper.xml

@@ -26,14 +26,14 @@
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        t.name as 产品名称,
-        t.model as '规格/型号',
-        t.technical_index as 技术指标,
-        t.unit_price as 单价（万元）,
-        t.production_unit as 生产单位,
-        t.purchase_num as 采购数量,
-        t.purchase_date as 购买日期,
-        su.name as 采购人
+        IF(ISNULL(t.name),'',t.name)  as 产品名称,
+        IF(ISNULL(t.model),'',t.model)  as '规格/型号',
+        IF(ISNULL(t.technical_index),'',t.technical_index)  as 技术指标,
+        IF(ISNULL(t.unit_price),'',t.unit_price)  as 单价（万元）,
+        IF(ISNULL(t.production_unit),'',t.production_unit)  as 生产单位,
+        IF(ISNULL(t.purchase_num),'',t.purchase_num)  as 采购数量,
+        IF(ISNULL(t.purchase_date),'',t.purchase_date)  as 购买日期,
+        IF(ISNULL(su.name),'',su.name)  as 采购人
         FROM plan_consumables_purchase t
         left join sys_user su on su.id = t.purchaser_id
         ,(select @i:=0)t

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanEquipmentMaintainMapper.xml

@@ -24,13 +24,13 @@
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        t.name as 产品名称,
-        t.model as '规格/型号',
-        t.code as 编号,
-        t.maintain_date as 维护日期,
-        t.maintain_content as 维护内容,
-        su.name as 执行人,
-        t.maintain_result as 完成情况
+        IF(ISNULL(t.name),'',t.name)  as 产品名称,
+        IF(ISNULL(t.model),'',t.model)  as '规格/型号',
+        IF(ISNULL(t.code),'',t.code)  as 编号,
+        IF(ISNULL(t.maintain_date),'',t.maintain_date) as 维护日期,
+        IF(ISNULL(t.maintain_content),'',t.maintain_content) as 维护内容,
+        IF(ISNULL(su.name),'',su.name)  as 执行人,
+        IF(ISNULL(t.maintain_result),'',t.maintain_result)  as 完成情况
         FROM plan_equipment_maintain t
         left join sys_user su on su.id = t.maintainer_id
         ,(select @i:=0)t

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanEquipmentPurchaseMapper.xml

@@ -26,14 +26,14 @@
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        t.name as 产品名称,
-        t.model as '规格/型号',
-        t.technical_index as 技术指标,
-        t.unit_price as 单价（万元）,
-        t.production_unit as 生产单位,
-        t.purchase_num as 采购数量,
-        t.purchase_date as 购买日期,
-        su.name as 采购人
+        IF(ISNULL(t.name),'',t.name) as 产品名称,
+        IF(ISNULL(t.model),'',t.model) as '规格/型号',
+        IF(ISNULL(t.technical_index),'',t.technical_index) as 技术指标,
+        IF(ISNULL(t.unit_price),'',t.unit_price) as 单价（万元）,
+        IF(ISNULL(t.production_unit),'',t.production_unit) as 生产单位,
+        IF(ISNULL(t.purchase_num),'',t.purchase_num) as 采购数量,
+        IF(ISNULL(t.purchase_date),'',t.purchase_date)  as 购买日期,
+        IF(ISNULL(su.name),'',su.name)  as 采购人
         FROM plan_equipment_purchase t
         left join sys_user su on su.id = t.purchaser_id
         ,(select @i:=0)t

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanEquipmentRepairMapper.xml

@@ -24,13 +24,13 @@
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        t.name as 产品名称,
-        t.model as '规格/型号',
-        t.technical_index as 技术指标,
-        t.unit_price as 单价（万元）,
-        t.production_unit as 生产单位,
-        t.repair_date as 维修日期,
-        su.name as 执行人
+        IF(ISNULL(t.name),'',t.name)  as 产品名称,
+        IF(ISNULL(t.model),'',t.model)  as '规格/型号',
+        IF(ISNULL(t.technical_index),'',t.technical_index)  as 技术指标,
+        IF(ISNULL(t.unit_price),'',t.unit_price)  as 单价（万元）,
+        IF(ISNULL(t.production_unit),'',t.production_unit)  as 生产单位,
+        IF(ISNULL(t.repair_date),'',t.repair_date)  as 维修日期,
+        IF(ISNULL(su.name),'',su.name)  as 执行人
         FROM plan_equipment_repair t
         left join sys_user su on su.id = t.repairer_id
         ,(select @i:=0)t

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanStandardPurchaseMapper.xml

@@ -27,11 +27,11 @@
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        t.name as 标物名称,
-        t.distribution_unit as 经销单位,
-        t.purchase_num as 采购数量,
-        t.purchase_date as 采购时间,
-        su.name as 采购人
+        IF(ISNULL(t.name),'',t.name) as 标物名称,
+        IF(ISNULL(t.distribution_unit),'',t.distribution_unit)  as 经销单位,
+        IF(ISNULL(t.purchase_num),'',t.purchase_num)  as 采购数量,
+        IF(ISNULL(t.purchase_date),'',t.purchase_date)  as 采购时间,
+        IF(ISNULL(su.name),'',su.name) as 采购人
         FROM plan_standard_purchase t
         left join sys_user su on su.id = t.purchaser_id
         ,(select @i:=0)t

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/PlanTrainingMapper.xml

@@ -45,15 +45,15 @@
 
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
-        pt.id as 序号,
-        pt.plan_object as 培训对象,
-        pt.objective as 培训目的,
-        pt.content as 培训内容,
-        pt.start_time as 培训时间,
-        pt.mode as 培训方式,
-        pt.people as 培训人,
-        pt.assessment as 考核人,
-        pt.implementation as 实施情况
+        IF(ISNULL(pt.id.name),'',pt.id)  as 序号,
+        IF(ISNULL(pt.plan_object),'',pt.plan_object)  as 培训对象,
+        IF(ISNULL(pt.objective),'',pt.objective)  as 培训目的,
+        IF(ISNULL(pt.content),'',pt.content)  as 培训内容,
+        IF(ISNULL(pt.start_time),'',pt.start_time)  as 培训时间,
+        IF(ISNULL(pt.mode),'',pt.mode)  as 培训方式,
+        IF(ISNULL(pt.people),'',pt.people)  as 培训人,
+        IF(ISNULL(pt.assessment),'',pt.assessment)  as 考核人,
+        IF(ISNULL(pt.implementation),'',pt.implementation)  as 实施情况
         from plan_training pt
         <include refid="where"/>
         ORDER BY pt.id ASC

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/ProjectMapper.xml

@@ -56,9 +56,9 @@
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        t.name as 项目名称,
-        t.code as 项目编号,
-        cl.name as 所属单位
+        IF(ISNULL(t.name),'',t.name)  as 项目名称,
+        IF(ISNULL(t.code),'',t.code)  as 项目编号,
+        IF(ISNULL(cl.name),'',cl.name)  as 所属单位
         FROM project t
         left join client cl on cl.id = t.client_id
         ,(select @i:=0)t

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/StandardMapper.xml

@@ -35,13 +35,13 @@
     <select id="exportList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        t.name as 标样名称,
-        t.code as 标物代号,
-        s.name as 经销单位,
-        t.position as 存放位置,
-        t.purchase_date as 进样日期,
-        t.valid_date as 有效日期,
-        t.stock_num as 剩余库存,
+        IF(ISNULL(t.name),'',t.name) as 标样名称,
+        IF(ISNULL(t.code),'',t.code) as 标物代号,
+        IF(ISNULL(s.name),'',s.name) as 经销单位,
+        IF(ISNULL(t.position),'',t.position) as 存放位置,
+        IF(ISNULL(t.purchase_date),'',t.purchase_date) as 进样日期,
+        IF(ISNULL(t.valid_date),'',t.valid_date) as 有效日期,
+        IF(ISNULL(t.stock_num),'',t.stock_num) as 剩余库存,
         (
         CASE t.status
         WHEN 0 THEN '已作废'

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/CommonServiceImpl.java

@@ -235,8 +235,21 @@ public class CommonServiceImpl {
 						jsonObject.put("TCaO",map.get("TCaO"));
 					}
 				}
-
-
+				if(jsonObject.containsKey("V1")){
+					if(map.containsKey("V1")){
+						jsonObject.put("V1",map.get("V1"));
+					}
+				}
+				if(jsonObject.containsKey("T")){
+					if(map.containsKey("T")){
+						jsonObject.put("T",map.get("T"));
+					}
+				}
+				if(jsonObject.containsKey("K")){
+					if(map.containsKey("K")){
+						jsonObject.put("K",map.get("K"));
+					}
+				}
 			}
 
 			String checkElement = JSON.toJSON(jsonArr).toString();
@@ -268,7 +281,6 @@ public class CommonServiceImpl {
 		return jsonArray;
 	}
 
-
 	//json数组转Map
 	public Map<String, String> jSONArrayToMap(JSONArray jsonArray){
 		Map<String, String> map = new LinkedHashMap<>();

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java

@@ -2032,6 +2032,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
         if (entrust == null) {
             return BaseResponse.errorMsg("委托信息错误");
         }
+        if(entrust.getStatus() == 4){
+            handle2Distribution(entrust.getId());
+        }
+
         //记录委托单日志
         logsService.saveLog(SysLogs.ObjType.ENTRUST_LOG, entrust.getId(), "完成样品处理任务", null);
         return BaseResponse.okMsg("已完成样品处理任务");
@@ -2215,6 +2219,82 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
         return BaseResponse.okMsg("已重新派发处理任务");
     }
 
+    /**
+     * //判断改委托单的所有样品检测项对应的处理项对应的处理人，然后按照检测项存入检测项表，以便校核的时候可以校核结果
+     * //只显示主样，因为样品处理只显示主样
+     * @param entrustId
+     */
+    private void handle2Distribution(Integer entrustId){
+        List<Sample> sampleHandleList = sampleMapper.getSampleList(entrustId);
+        if (sampleHandleList != null && sampleHandleList.size() > 0) {
+            for (Sample sample : sampleHandleList) {
+                String teamIds = sample.getTeamIds();
+                if (teamIds != null) {
+                    String[] teamIdS = teamIds.split("、");
+                    for (String teamId : teamIdS) {
+                        TeamVo teamVo = teamMapper.getDetail(Integer.valueOf(teamId));
+//                            List<Integer> userIdsList = new ArrayList<>();
+                        if (teamVo != null && teamVo.getIsPf() == 0) {
+                            String handleIds = teamVo.getHandleId();
+                            if (handleIds != null) {
+                                String[] handleIdS = handleIds.split("、");
+                                for (String handleId : handleIdS) {
+                                    //样品id 处理人id  关联的处理项表信息进行展示
+                                    QueryWrapper<SampleHandle> handleWrapper = new QueryWrapper<>();
+                                    handleWrapper.eq("sample_id", sample.getId());
+                                    handleWrapper.eq("handle_id", handleId);
+                                    List<SampleHandle> handleList = sampleHandleMapper.selectList(handleWrapper);
+                                    if(handleList != null && handleList.size()>0){
+                                        for (SampleHandle sampleHandle : handleList) {
+                                            SampleDistribution sampleDistribution = new SampleDistribution();
+                                            sampleDistribution.setEntrustId(entrustId)
+                                                    .setSampleId(sample.getId())
+                                                    .setTeamGroupId(teamVo.getGroupId())
+                                                    .setTeamId(teamVo.getId())
+                                                    .setUserId(sampleHandle.getUserId())
+                                                    .setCreateTime(sampleHandle.getCreateTime())
+                                                    .setStatus(2)  //直接进入待校核状态
+                                                    .setAcceptTime(sampleHandle.getAcceptTime())
+                                                    .setFinishTime(sampleHandle.getFinishTime());
+                                            distributionService.save(sampleDistribution);
+//                                                sampleDistributionList.add(sampleDistribution);
+
+                                            //将样品处理的附件复制到样品检测的附件表中  如果校核附件有重复，可以去掉这个逻辑
+                                            Map<String, Object> params = new HashMap<>();
+                                            params.put("sampleHandleId", sampleHandle.getId());
+                                            List<SampleHandleEnclosureVo> list = sampleHandleEnclosureMapper.getList(params);
+                                            if(list != null && list.size()>0){
+                                                for(SampleHandleEnclosureVo shev : list){
+                                                    SampleDistributionEnclosure sampleDistributionEnclosure = new SampleDistributionEnclosure();
+                                                    sampleDistributionEnclosure.setSampleDistributionId(sampleDistribution.getId())
+                                                            .setTeamId(sampleDistribution.getTeamId())
+                                                            .setUserId(sampleDistribution.getUserId())
+                                                            .setCreateTime(shev.getCreateTime())
+                                                            .setStatus(shev.getStatus())
+                                                            .setAlias(shev.getAlias())
+                                                            .setEnclosureUrl(shev.getEnclosureUrl())
+                                                            .setExtName(shev.getExtName())
+                                                            .setUpdateTime(LocalDateTime.now())
+                                                            .setPdfUrl(shev.getPdfUrl())
+                                                            .setIsPublic(0); //默认不允许公开
+                                                    if (StringUtils.isEmpty(shev.getEnclosureUrl())) {
+                                                        sampleDistributionEnclosure.setStatus(2); //上传失败
+                                                    }
+                                                    sampleDistributionEnclosureMapper.insert(sampleDistributionEnclosure);
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+    }
+
 
     /**
      * 派发检测项目任务
@@ -2245,77 +2325,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
             List<SampleDistributionQuery> sampleDistributionQueryList = query.getSampleDistributionQueryList();
 //            List<SampleDistribution> sampleDistributionList = new ArrayList<>();
 
-            //判断改委托单的所有样品检测项对应的处理项对应的处理人，然后按照检测项存入检测项表，以便校核的时候可以校核结果
-            //只显示主样，因为样品处理只显示主样
-            List<Sample> sampleHandleList = sampleMapper.getSampleList(entrust.getId());
-            if (sampleHandleList != null && sampleHandleList.size() > 0) {
-                for (Sample sample : sampleHandleList) {
-                    String teamIds = sample.getTeamIds();
-                    if (teamIds != null) {
-                        String[] teamIdS = teamIds.split("、");
-                        for (String teamId : teamIdS) {
-                            TeamVo teamVo = teamMapper.getDetail(Integer.valueOf(teamId));
-//                            List<Integer> userIdsList = new ArrayList<>();
-                            if (teamVo != null && teamVo.getIsPf() == 0) {
-                                String handleIds = teamVo.getHandleId();
-                                if (handleIds != null) {
-                                    String[] handleIdS = handleIds.split("、");
-                                    for (String handleId : handleIdS) {
-                                        //样品id 处理人id  关联的处理项表信息进行展示
-                                        QueryWrapper<SampleHandle> handleWrapper = new QueryWrapper<>();
-                                        handleWrapper.eq("sample_id", sample.getId());
-                                        handleWrapper.eq("handle_id", handleId);
-                                        List<SampleHandle> handleList = sampleHandleMapper.selectList(handleWrapper);
-                                        if(handleList != null && handleList.size()>0){
-                                            for (SampleHandle sampleHandle : handleList) {
-                                                SampleDistribution sampleDistribution = new SampleDistribution();
-                                                sampleDistribution.setEntrustId(entrust.getId())
-                                                        .setSampleId(sample.getId())
-                                                        .setTeamGroupId(teamVo.getGroupId())
-                                                        .setTeamId(teamVo.getId())
-                                                        .setUserId(sampleHandle.getUserId())
-                                                        .setCreateTime(sampleHandle.getCreateTime())
-                                                        .setStatus(2)  //直接进入待校核状态
-                                                        .setAcceptTime(sampleHandle.getAcceptTime())
-                                                        .setFinishTime(sampleHandle.getFinishTime());
-                                                distributionService.save(sampleDistribution);
-//                                                sampleDistributionList.add(sampleDistribution);
-
-                                                //将样品处理的附件复制到样品检测的附件表中  如果校核附件有重复，可以去掉这个逻辑
-                                                Map<String, Object> params = new HashMap<>();
-                                                params.put("sampleHandleId", sampleHandle.getId());
-                                                List<SampleHandleEnclosureVo> list = sampleHandleEnclosureMapper.getList(params);
-                                                if(list != null && list.size()>0){
-                                                    for(SampleHandleEnclosureVo shev : list){
-                                                        SampleDistributionEnclosure sampleDistributionEnclosure = new SampleDistributionEnclosure();
-                                                        sampleDistributionEnclosure.setSampleDistributionId(sampleDistribution.getId())
-                                                                .setTeamId(sampleDistribution.getTeamId())
-                                                                .setUserId(sampleDistribution.getUserId())
-                                                                .setCreateTime(shev.getCreateTime())
-                                                                .setStatus(shev.getStatus())
-                                                                .setAlias(shev.getAlias())
-                                                                .setEnclosureUrl(shev.getEnclosureUrl())
-                                                                .setExtName(shev.getExtName())
-                                                                .setUpdateTime(LocalDateTime.now())
-                                                                .setPdfUrl(shev.getPdfUrl())
-                                                                .setIsPublic(0); //默认不允许公开
-                                                        if (StringUtils.isEmpty(shev.getEnclosureUrl())) {
-                                                            sampleDistributionEnclosure.setStatus(2); //上传失败
-                                                        }
-                                                        sampleDistributionEnclosureMapper.insert(sampleDistributionEnclosure);
-                                                    }
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            /*************上面是样品处理的   下面是样品检测的***************/
+            /*************上面是样品处理 (样品处理进入检测表提前到样品处理完成的时候了)  下面是样品检测的***************/
 
             List<Sample> sampleList = new ArrayList<>();
             for (SampleDistributionQuery distributionQuery : sampleDistributionQueryList) {

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/NonStandardApplyServiceImpl.java

@@ -87,7 +87,7 @@ public class NonStandardApplyServiceImpl extends ServiceImpl<NonStandardApplyMap
 		}
 
 		if(query.getReportedHours() == null){
-			return BaseResponse.errorMsg("工作类型不能为空");
+			return BaseResponse.errorMsg("上报工日不能为空");
 		}
 
 		NonStandardApply cama = new NonStandardApply();

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanEquipmentMaintainServiceImpl.java

@@ -162,6 +162,7 @@ public class PlanEquipmentMaintainServiceImpl extends ServiceImpl<PlanEquipmentM
 		}
 		PlanEquipmentMaintain pep = equipmentMaintainMapper.selectById(query.getId());
 		BeanUtils.copyProperties(query, pep);
+		pep.setMaintainDate(query.getMaintainDate());
 		equipmentMaintainMapper.updateById(pep);
 		return BaseResponse.okData(pep);
 	}

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanEquipmentRepairServiceImpl.java

@@ -126,6 +126,10 @@ public class PlanEquipmentRepairServiceImpl extends ServiceImpl<PlanEquipmentRep
 		if (StringUtils.isEmpty(query.getName())) {
 			return BaseResponse.errorMsg("产品名称不能为空!");
 		}
+
+
+
+
 		QueryWrapper<PlanEquipmentRepair> qw = new QueryWrapper<>();
 		qw.eq("name", query.getName());
 		int count = equipmentRepairMapper.selectCount(qw);

cement-business/target/classes/cn/wise/sc/cement/business/mapper/DataStatisticsMapper.xml

@@ -185,11 +185,11 @@
     <select id="exportEntrustList" resultType="java.util.HashMap">
         SELECT
         (@i:=@i+1) as 序号,
-        e.id as entrustId,
+        IF(ISNULL(e.id),'',e.id)   as entrustId,
         IF(ISNULL(e.entrust_code),'',e.entrust_code) as 委托单号,
         IF(ISNULL(p.name),'',p.name) as 项目名称,
         IF(ISNULL(p.name),'',p.name)  as 项目编号,
-        e.project_type as 项目类型,
+        IF(ISNULL(e.project_type),'',e.project_type)   as 项目类型,
         IF(ISNULL(su.name),'',su.name) as 委托人,
         IF(ISNULL(c.name),'',c.name) as 委托单位,
         IF(ISNULL(e.entrust_date),'',e.entrust_date)  as 委托日期,
@@ -353,7 +353,10 @@
     </select>
 
     <select id="exportTeamList" resultType="java.util.HashMap">
-        SELECT (@i:=@i+1) as 序号,t.id as id, t.name as 检测项目, count(*) as 检测项数量
+        SELECT (@i:=@i+1) as 序号,
+        t.id as id,
+        t.name as 检测项目,
+        count(*) as 检测项数量
         FROM sample_distribution sd
         left join team t on t.id = sd.team_id
         ,(select @i:=0)t