Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -350,10 +350,10 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
         if (denominator == NumConstant.ZERO){
             return "0.00%";
         }
-        BigDecimal bigDecimalMolecule = new BigDecimal(molecule);
+        BigDecimal bigDecimalMolecule = new BigDecimal(molecule * NumConstant.ONE_HUNDRED);
         BigDecimal bigDecimalDenominator = new BigDecimal(denominator);
         BigDecimal divide = bigDecimalMolecule.divide(bigDecimalDenominator, NumConstant.TWO, BigDecimal.ROUND_HALF_UP);
-        return divide.multiply(NumConstant.ONE_HUNDRED_DECIMAL)+"%";
+        return divide+"%";
     }
 
     /**

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml

@@ -208,7 +208,7 @@
                 AND (cd.EPMET_CATEGORY_CODE IS NULL OR cd.EPMET_CATEGORY_CODE = '')
             </if>
             AND cd.EPMET_CATEGORY_CODE != ''
-            AND pd.PROJECT_STATUS_CODE = 'closed'
+            AND pd.PROJECT_STATUS_CODE IN ('closed','closed_case')
             AND pd.ALL_PARENT_IDS LIKE CONCAT('%',(SELECT AGENCY_ID FROM screen_customer_agency WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND PID = '0'),'%')
             AND DATE_FORMAT(pd.project_create_time,'%Y%m%d') <![CDATA[ <= ]]> #{dateId}
             GROUP BY categoryCode

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcEnsureHouseDTO.java

@@ -61,7 +61,7 @@ public class IcEnsureHouseDTO implements Serializable {
     /**
      * 发证日期
      */
-	private Date fzrq;
+	private String fzrq;
 
     /**
      * 补贴编号

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPartyMemberDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -51,12 +52,12 @@ public class IcPartyMemberDTO implements Serializable {
     /**
      * 入党时间
      */
-	private Date rdsj;
+	private String rdsj;
 
     /**
      * 转正时间
      */
-	private Date zzsj;
+	private String zzsj;
 
     /**
      * 所属支部

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java

@@ -301,7 +301,7 @@ public class IcResiUserDTO implements Serializable {
     /**
      * 患大病时间
      */
-	private Date dbsj;
+	private String dbsj;
 
     /**
      * 所患慢性病
@@ -311,7 +311,7 @@ public class IcResiUserDTO implements Serializable {
     /**
      * 患慢性病时间
      */
-	private Date mxbsj;
+	private String mxbsj;
 
     /**
      * 是否参保
@@ -331,7 +331,7 @@ public class IcResiUserDTO implements Serializable {
     /**
      * 救助时间[yyyy-MM-dd]
      */
-	private Date jzsj;
+	private String jzsj;
 
     /**
      * 享受救助明细序号
@@ -356,7 +356,7 @@ public class IcResiUserDTO implements Serializable {
     /**
      * 离退休时间
      */
-	private Date ltxsj;
+	private String ltxsj;
 
     /**
      * 工作信息备注

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcUnemployedDTO.java

@@ -61,7 +61,7 @@ public class IcUnemployedDTO implements Serializable {
     /**
      * 失业时间
      */
-	private Date sysj;
+	private String sysj;
 
     /**
      * 失业证号

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVeteransDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -51,12 +52,12 @@ public class IcVeteransDTO implements Serializable {
     /**
      * 入伍时间
      */
-	private Date rwsj;
+	private String rwsj;
 
     /**
      * 退伍时间
      */
-	private Date twsj;
+	private String twsj;
 
     /**
      * 服役单位
@@ -81,7 +82,7 @@ public class IcVeteransDTO implements Serializable {
     /**
      * 参战时间【年月日区间值yyyy-MM-dd~yyyy-MM-dd】
      */
-	private Date czsj;
+	private String czsj;
 
     /**
      * 现就业情况

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcEnsureHouseEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 保障房
  *
@@ -61,7 +58,7 @@ public class IcEnsureHouseEntity extends BaseEpmetEntity {
     /**
      * 发证日期
      */
-	private Date fzrq;
+	private String fzrq;
 
     /**
      * 补贴编号

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPartyMemberEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 党员
  *
@@ -51,12 +48,12 @@ public class IcPartyMemberEntity extends BaseEpmetEntity {
     /**
      * 入党时间
      */
-	private Date rdsj;
+	private String rdsj;
 
     /**
      * 转正时间
      */
-	private Date zzsj;
+	private String zzsj;
 
     /**
      * 所属支部

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 用户基础信息
  *
@@ -301,7 +298,7 @@ public class IcResiUserEntity extends BaseEpmetEntity {
     /**
      * 患大病时间
      */
-	private Date dbsj;
+	private String dbsj;
 
     /**
      * 所患慢性病
@@ -311,7 +308,7 @@ public class IcResiUserEntity extends BaseEpmetEntity {
     /**
      * 患慢性病时间
      */
-	private Date mxbsj;
+	private String mxbsj;
 
     /**
      * 是否参保
@@ -331,7 +328,7 @@ public class IcResiUserEntity extends BaseEpmetEntity {
     /**
      * 救助时间[yyyy-MM-dd]
      */
-	private Date jzsj;
+	private String jzsj;
 
     /**
      * 享受救助明细序号
@@ -356,7 +353,7 @@ public class IcResiUserEntity extends BaseEpmetEntity {
     /**
      * 离退休时间
      */
-	private Date ltxsj;
+	private String ltxsj;
 
     /**
      * 工作信息备注

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcUnemployedEntity.java

@@ -61,7 +61,7 @@ public class IcUnemployedEntity extends BaseEpmetEntity {
     /**
      * 失业时间
      */
-	private Date sysj;
+	private String sysj;
 
     /**
      * 失业证号

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcVeteransEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 退役军人
  *
@@ -51,12 +48,12 @@ public class IcVeteransEntity extends BaseEpmetEntity {
     /**
      * 入伍时间
      */
-	private Date rwsj;
+	private String rwsj;
 
     /**
      * 退伍时间
      */
-	private Date twsj;
+	private String twsj;
 
     /**
      * 服役单位
@@ -81,7 +78,7 @@ public class IcVeteransEntity extends BaseEpmetEntity {
     /**
      * 参战时间【年月日区间值yyyy-MM-dd~yyyy-MM-dd】
      */
-	private Date czsj;
+	private String czsj;
 
     /**
      * 现就业情况

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcEnsureHouseExcel.java

@@ -47,7 +47,7 @@ public class IcEnsureHouseExcel {
     private String bzlx;
 
     @Excel(name = "发证日期")
-    private Date fzrq;
+    private String fzrq;
 
     @Excel(name = "补贴编号")
     private String btbh;

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcPartyMemberExcel.java

@@ -41,10 +41,10 @@ public class IcPartyMemberExcel {
     private String icResiUser;
 
     @Excel(name = "入党时间")
-    private Date rdsj;
+    private String rdsj;
 
     @Excel(name = "转正时间")
-    private Date zzsj;
+    private String zzsj;
 
     @Excel(name = "所属支部")
     private String sszb;

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserExcel.java

@@ -188,13 +188,13 @@ public class IcResiUserExcel {
     private String shdb;
 
     @Excel(name = "患大病时间")
-    private Date dbsj;
+    private String dbsj;
 
     @Excel(name = "所患慢性病")
     private String shmxb;
 
     @Excel(name = "患慢性病时间")
-    private Date mxbsj;
+    private String mxbsj;
 
     @Excel(name = "是否参保")
     private String isCb;
@@ -206,7 +206,7 @@ public class IcResiUserExcel {
     private String jzje;
 
     @Excel(name = "救助时间[yyyy-MM-dd]")
-    private Date jzsj;
+    private String jzsj;
 
     @Excel(name = "享受救助明细序号")
     private String jzmxxh;
@@ -221,7 +221,7 @@ public class IcResiUserExcel {
     private String zy;
 
     @Excel(name = "离退休时间")
-    private Date ltxsj;
+    private String ltxsj;
 
     @Excel(name = "工作信息备注")
     private String workRemake;

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcUnemployedExcel.java

@@ -47,7 +47,7 @@ public class IcUnemployedExcel {
     private String syrylb;
 
     @Excel(name = "失业时间")
-    private Date sysj;
+    private String sysj;
 
     @Excel(name = "失业证号")
     private String syzh;

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcVeteransExcel.java

@@ -41,10 +41,10 @@ public class IcVeteransExcel {
     private String icResiUser;
 
     @Excel(name = "入伍时间")
-    private Date rwsj;
+    private String rwsj;
 
     @Excel(name = "退伍时间")
-    private Date twsj;
+    private String twsj;
 
     @Excel(name = "服役单位")
     private String fydw;
@@ -59,7 +59,7 @@ public class IcVeteransExcel {
     private String pxzk;
 
     @Excel(name = "参战时间【年月日区间值yyyy-MM-dd~yyyy-MM-dd】")
-    private Date czsj;
+    private String czsj;
 
     @Excel(name = "现就业情况")
     private String xjyqk;