安全管理同步修改

YYC

2023-11-20 bed1d43552b7692aa81b2d50923dac3f6aed961c

安全管理同步修改

 src/main/java/com/fzzy/api/entity/Api1301.java

@@ -97,7 +97,7 @@

    @JSONField(format = "yyyy-MM-dd")
    @PropertyDef(label = "整改时限" )
    @Column(name = "zgsx", length = 10)
    @Column(name = "zgsx")
    private Date zgsx;

    @PropertyDef(label = "责任单位" )

 src/main/java/com/fzzy/api/utils/ShRSAUtils.java

@@ -1,6 +1,6 @@
package com.fzzy.api.utils;

;


import org.apache.commons.codec.binary.Base64;


 src/main/java/com/fzzy/api/view/Api1401.view.xml

@@ -38,6 +38,8 @@
      </PropertyDef>
      <PropertyDef name="ylcbgmjhsl">
        <Property name="label">储备规模计划数量</Property>
        <Property name="dataType">double</Property>
        <Property name="displayFormat">#0.000吨</Property>
      </PropertyDef>
      <PropertyDef name="cbgmjhwh">
        <Property name="label">储备规模计划文号</Property>

 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java

@@ -105,7 +105,12 @@
                api1310.setJydw(fz40Quality.getUser());
                api1310.setJyr(fz40Quality.getUser());
                api1310.setJyyj(fz40Quality.getStandard());
                api1310.setZblb(fz40Quality.getZblb());
                if (StringUtils.isEmpty(fz40Quality.getZblb())) {
                    api1310.setZblb("2");
                } else {
                    api1310.setZblb(fz40Quality.getZblb());
                }

                //检测项，检测值
                jyxm = "";
                jyz = "";
@@ -131,7 +136,7 @@
                api1310.setQfrq(fz40Quality.getTime());
                api1310.setBgcjsj(fz40Quality.getTime());
                api1310.setShrxm(fz40Quality.getCheckUser());
                if(null == fz40Quality.getCheckTime()){
                if (null == fz40Quality.getCheckTime()) {
                    fz40Quality.setCheckTime(DateUtils.addDays(fz40Quality.getTime(), -1));
                }
                if (!fz40Quality.getCheckTime().before(fz40Quality.getTime())) {

 src/main/java/com/fzzy/async/fzzy40/repository/Fzzy40Sync1208Rep.java

@@ -18,6 +18,6 @@
     *
     * @return
     */
    @Query("from Fz40DepotStore where deptId=:deptId and createDate >=:start and createDate <:end order by createDate ")
    @Query("from Fz40DepotStore where deptId=:deptId and updateDate >=:start and updateDate <:end order by updateDate ")
    List<Fz40DepotStore> listDepot(@Param("deptId") String deptId, @Param("start") Date start, @Param("end") Date end);
}