整理正式环境bug

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseInformationController.java

@@ -76,8 +76,8 @@ public class AppEnterpriseInformationController extends BaseController
     /**
      * 新增保存企业信息登记
      */
-    @RequiresPermissions("code:information:add")
-    @PostMapping("/add")
+//    @RequiresPermissions("code:information:add")
+    @PostMapping("/addSave")
     @ResponseBody
     public ZDResponse addSave(@RequestBody EnterpriseInformation enterpriseInformation)
     {

lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/user/user.html

@@ -229,7 +229,7 @@
 						// actions.push('<a class="btn btn-primary btn-xs" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.userId + '\',\'' + ($(window).width()) + '\',\'' + ($(window).height()) + '\')"><i class="fa fa-eye"></i> 查看</a> ');
 		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.userId + '\',1071,617)"><i class="fa fa-edit"></i> 编辑</a> ');
 		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i> 删除</a> ');
-		                // actions.push('<a class="btn btn-reset btn-xs ' + resetPwdFlag + '" href="javascript:void(0)" onclick="resetPwd(\'' + row.userId + '\')"><i class="fa fa-refresh"></i> 重置</a>');
+		                actions.push('<a class="btn btn-reset btn-xs ' + resetPwdFlag + '" href="javascript:void(0)" onclick="resetPwd(\'' + row.userId + '\')"><i class="fa fa-refresh"></i> 重置</a>');
 		                return actions.join('');
 		            }
 		        }]

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java

@@ -124,6 +124,9 @@ public class EnforcementRegistration extends BaseDomain
      */
     private String endTime;
 
+    /** 未扫码原因 */
+    private String enforce;
+
     /**
      * 关键字查询
      */
@@ -136,6 +139,14 @@ public class EnforcementRegistration extends BaseDomain
     private String subsidiaryerText;
     private List fileListObj;
 
+    public String getEnforce() {
+        return enforce;
+    }
+
+    public void setEnforce(String enforce) {
+        this.enforce = enforce;
+    }
+
     public List getFileListObj() {
         return fileListObj;
     }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnterpriseInformation.java

@@ -3,6 +3,7 @@ package com.zdxt.code.domain;
 import com.zdxt.common.BaseDomain;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -40,7 +41,7 @@ public class EnterpriseInformation extends BaseDomain
     private String registeredCapital;
 
     /** 成立日期 */
-    private Date establishmentTime;
+    private String establishmentTime;
 
     /** 营业期限 */
     private String operatingTerm;
@@ -163,15 +164,15 @@ public class EnterpriseInformation extends BaseDomain
     {
         return registeredCapital;
     }
-    public void setEstablishmentTime(Date establishmentTime) 
-    {
-        this.establishmentTime = establishmentTime;
-    }
 
-    public Date getEstablishmentTime() 
-    {
+    public String getEstablishmentTime() {
         return establishmentTime;
     }
+
+    public void setEstablishmentTime(String establishmentTime) {
+        this.establishmentTime = establishmentTime;
+    }
+
     public void setOperatingTerm(String operatingTerm)
     {
         this.operatingTerm = operatingTerm;

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java

@@ -133,7 +133,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
             //企业类型
             enterpriseInformation.setCompanyOrgType(jsonObject.getString("companyOrgType"));
             //注册时间
-            enterpriseInformation.setEstablishmentTime(jsonObject.getSqlDate("establishDate"));
+            enterpriseInformation.setEstablishmentTime(jsonObject.getString("establishDate"));
             //经营范围
             enterpriseInformation.setBusinessScope(jsonObject.getString("businessScope"));
             //注册地址

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml

@@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lawEnforcementCode"    column="law_enforcement_code"    />
         <result property="isComplaint"    column="is_complaint"    />
         <result property="isSubmit"    column="is_submit"    />
+        <result property="enforce"    column="enforce"    />
     </resultMap>
 
     <resultMap type="com.zdxt.code.domain.EnforceRegCount" id="EnforceRegCountResult">
@@ -43,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEnforcementRegistrationVo">
-        select id, law_enforcement, law_enforcement_id, enterprise_id, enterprise_name, enterprise_number, enforcement_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_tel, law_enforcer_two, law_enforcer_id_two, law_enforcer_tel_two, subsidiaryer, subsidiaryer_id, subsidiaryer_tel, law_enforcement_item, law_enforcement_basis, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code,is_complaint,is_submit from enforcement_registration
+        select id, law_enforcement, law_enforcement_id, enforce, enterprise_id, enterprise_name, enterprise_number, enforcement_time, create_time, create_by, law_enforcer, law_enforcer_id, law_enforcer_tel, law_enforcer_two, law_enforcer_id_two, law_enforcer_tel_two, subsidiaryer, subsidiaryer_id, subsidiaryer_tel, law_enforcement_item, law_enforcement_basis, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code,is_complaint,is_submit from enforcement_registration
     </sql>
 
     <select id="selectEnforcementRegistrationList" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">
@@ -137,6 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subsidiaryerTel != null  and subsidiaryerTel != ''">subsidiaryer_tel,</if>
             <if test="lawEnforcementItem != null  and lawEnforcementItem != ''">law_enforcement_item,</if>
             <if test="lawEnforcementBasis != null  and lawEnforcementBasis != ''">law_enforcement_basis,</if>
+            <if test="enforce != null  and enforce != ''">enforce,</if>
             <if test="remark != null  and remark != ''">remark,</if>
             <if test="reslut != null ">reslut,</if>
             <if test="userId != null ">user_id,</if>
@@ -168,6 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subsidiaryerTel != null  and subsidiaryerTel != ''">#{subsidiaryerTel},</if>
             <if test="lawEnforcementItem != null  and lawEnforcementItem != ''">#{lawEnforcementItem},</if>
             <if test="lawEnforcementBasis != null  and lawEnforcementBasis != ''">#{lawEnforcementBasis},</if>
+            <if test="enforce != null  and enforce != ''">#{enforce},</if>
             <if test="remark != null  and remark != ''">#{remark},</if>
             <if test="reslut != null ">#{reslut},</if>
             <if test="userId != null ">#{userId},</if>
@@ -202,6 +205,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subsidiaryerTel != null  and subsidiaryerTel != ''">subsidiaryer_tel = #{subsidiaryerTel},</if>
             <if test="lawEnforcementItem != null  and lawEnforcementItem != ''">law_enforcement_item = #{lawEnforcementItem},</if>
             <if test="lawEnforcementBasis != null  and lawEnforcementBasis != ''">law_enforcement_basis = #{lawEnforcementBasis},</if>
+            <if test="enforce != null  and enforce != ''">enforce = #{enforce},</if>
             <if test="remark != null  and remark != ''">remark = #{remark},</if>
             <if test="reslut != null ">reslut = #{reslut},</if>
             <if test="userId != null ">user_id = #{userId},</if>