Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PowerStationEngineeringInfo.java

 package com.yeejoin.amos.boot.module.hygf.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -104,7 +105,7 @@ public class PowerStationEngineeringInfo extends BaseEntity {
     private Long workOrderPowerStationId;
 
 
-    @TableField("completion_date")
+    @TableField(value = "completion_date",updateStrategy = FieldStrategy.IGNORED)
     private Date completionDate;
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PreparationMoney.java

 package com.yeejoin.amos.boot.module.hygf.api.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
@@ -115,7 +116,7 @@ public class PreparationMoney extends BaseEntity {
     /**
      * 发货时间
      */
-    @TableField("delivery_time")
+    @TableField(value = "delivery_time",updateStrategy = FieldStrategy.IGNORED)
     private Date deliveryTime;
     /**
      * 到货时间

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java

@@ -867,16 +867,13 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
         model.setSurveyInformationId(surveyInformationDto.getSequenceNbr());
         model.setSurveyOrNot(0);
         model.setReview(0);
-        if (model.getCreationTime() == null) {
-            model.setCreationTime(new Date());
-        }
         model.setPeasantHouseholdNo(this.getPeasantHouseholdNo(model.getRegionalCompaniesSeq()));
         model.setIsCertified(model.getIsCertified() == null ? 0 : model.getIsCertified());// 未认证
 
         PeasantHousehold peasantHousehold = new PeasantHousehold();
         BeanUtils.copyProperties(model, peasantHousehold);
         peasantHousehold.setSequenceNbr(null);
-        peasantHousehold.setRecDate(new Date());
+        model.setCreationTime(new Date());
         peasantHousehold.setConstructionState(ArrivalStateeEnum.待勘察.getCode());
         this.save(peasantHousehold);
         //生成合同

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WorkOrderServiceImpl.java

@@ -980,6 +980,13 @@ public class WorkOrderServiceImpl extends BaseService<WorkOrderDto, WorkOrder, W
             upq.set(WorkOrder::getWorkOrderStatus, WorkOrderEnum.未通过.getCode());
             workOrderMapper.update(null, upq);
 
+			// 修改完工时间
+			LambdaUpdateWrapper<PowerStationEngineeringInfo> upq1 = new LambdaUpdateWrapper();
+			upq1.eq(PowerStationEngineeringInfo::getWorkOrderPowerStationId,
+					workOrderPowerStation.getSequenceNbr());
+			upq1.set(PowerStationEngineeringInfo::getCompletionDate, null);
+			powerStationEngineeringInfoMapper.update(null, upq1);
+
         }
 
         // 增加操作日志

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/Region.java

@@ -34,7 +34,7 @@ public class Region  {
     /**
      * 等级
      */
-	@TableField("LEVEL")
+	@TableField("LEVEL_")
     private String level;
 
     /**

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -2,7 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper">
     <select id="getStationCapactityByStationWerks" resultType="Double">
-        select SUM(IFNULL(trim(CAPACITYL),0)) from sjgl_zsj_zsbtz where WERKS = #{WERKS}
+        SELECT SUM(CASE WHEN TRIM(CAPACITYL) IS NULL OR TRIM(CAPACITYL) = '' THEN 0 ELSE CAST(TRIM(CAPACITYL) AS DECIMAL(10, 2)) END)
+        FROM sjgl_zsj_zsbtz
+        WHERE WERKS =#{WERKS}
     </select>
 
     <select id="getStationInfoMapByStationWerks" resultType="map">