提交评价批次字段

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

@@ -388,7 +388,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController
         // 执法人员需要展示用户名+执法码
         UserBean userBean1 = new UserBean();
         if (StringUtils.isNotEmpty(enfrorcement.getLawEnforcerId())) {
-            userBean1 = userApi.getUserByUserStrId(enfrorcement.getLawEnforcerId());
+            userBean1 = userApi.getUserByUserId(Long.valueOf(enfrorcement.getLawEnforcerId()));
             if(StrUtil.isNotEmpty(String.valueOf(userBean1.getUserId()))){
                 String lawCertificateNum = StringUtils.isEmpty(userBean1.getLawCertificateNum())?"":
                         userBean1.getLawCertificateNum();

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml

@@ -60,6 +60,7 @@
         <result property="orderNum" column="order_num"/>
         <result property="leader" column="leader"/>
         <result property="status" column="dept_status"/>
+        <result property="zzDisplayPath" column="zzDisplayPath"/>
     </resultMap>
 
     <resultMap id="RoleResult" type="Role">
@@ -154,7 +155,7 @@
 
     <select id="selectUserListByHave" parameterType="User" resultMap="UserResult">
         select u.user_id, u.dept_id, u.login_name, u.user_name, u.email, u.avatar, u.phonenumber, u.password, u.sex,
-        u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.type, d.dept_name, u.law_certificate_num,
+        u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.type, d.dept_name,d.zzDisplayPath, u.law_certificate_num,
         d.leader,u.tenant_code,t.tenant_code, t.tenant_name, t.contact_man, t.contact_number, t.address
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/oracle/UserOracleDao.xml

@@ -38,7 +38,8 @@
         <result property="orderNum" column="order_num"/>
         <result property="leader" column="leader"/>
         <result property="status" column="dept_status"/>
-    </resultMap>
+        <result property="zzDisplayPath" column="zzDisplayPath"/>
+</resultMap>
 
     <resultMap id="RoleResult" type="Role">
         <id property="roleId" column="role_id"/>
@@ -51,7 +52,7 @@
 
     <sql id="selectUserVo">
         select  u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber, u.sex, u.password, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_time, u.remark,u.kingdee_org_id,u.kingdee_user_id,
-       		    d.dept_id, d.parent_id, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+       		    d.dept_id, d.parent_id, d.dept_name, d.order_num,d.zzDisplayPath, d.leader, d.status as dept_status,
        		    r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
 		from sys_user u
 			 left join sys_dept d on u.dept_id = d.dept_id
@@ -115,7 +116,7 @@
     <select id="selectUserListByNoPermission" parameterType="User" resultMap="UserResult">
         select u.user_id, u.dept_id, u.login_name, u.user_name, u.user_type, u.email, u.avatar, u.phonenumber,
         u.password, u.sex, u.salt, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
-        d.dept_name, d.leader from sys_user u
+        d.dept_name, d.leader,d.zzDisplayPath from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         where u.del_flag = '0'
         <if test="loginName != null and loginName != ''">

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

@@ -26,6 +26,11 @@ public class EnterpriseEvaluate extends BaseDomain
     /** 案件ID */
     private String enforcementId;
 
+    /**
+     * 批次ID-关联执法登记批次ID
+     */
+    private String batchId;
+
     /** 评价｜意见建议 */
     private String evaluateDescription;
 
@@ -70,7 +75,15 @@ public class EnterpriseEvaluate extends BaseDomain
     private List<String> fileList;
 
 
-    public void setId(String id) 
+    public String getBatchId() {
+        return batchId;
+    }
+
+    public void setBatchId(String batchId) {
+        this.batchId = batchId;
+    }
+
+    public void setId(String id)
     {
         this.id = id;
     }

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

@@ -14,6 +14,7 @@ import com.zdxt.code.mapper.EnforcementRegistrationMapper;
 import com.zdxt.code.mapper.EnterpriseEvaluateMapper;
 import com.zdxt.code.service.IEnterpriseEvaluateService;
 import com.zdxt.common.util.DateUtils;
+import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.zdxtFile.ZdxtFileCommon;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -92,6 +93,12 @@ public class EnterpriseEvaluateServiceImpl implements IEnterpriseEvaluateService
             enterpriseEvaluate.setEnterpriseName(enforcementRegistration.getEnterpriseName());
             enterpriseEvaluate.setEnterpriseNumber(enforcementRegistration.getEnterpriseNumber());
         }
+        //批次ID不为空，则判断为联合执法
+        if(StringUtils.isNotEmpty(enforcementRegistration.getUniteCheck())){
+            enterpriseEvaluate.setBatchId(enforcementRegistration.getUniteCheck());
+        }
+
+
         int i = enterpriseEvaluateMapper.insertEnterpriseEvaluate(enterpriseEvaluate);
 
         if(i > 0 && enterpriseEvaluate.getFileList().size() > 0){

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

@@ -63,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkEffect != null ">check_effect,</if>
             <if test="checkQuality != null ">check_quality,</if>
             <if test="serviceExperience != null ">service_experience,</if>
+            <if test="batchId != null and batchId != '' ">batch_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">#{id},</if>
@@ -77,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkEffect != null ">#{checkEffect},</if>
             <if test="checkQuality != null ">#{checkQuality},</if>
             <if test="serviceExperience != null ">#{serviceExperience},</if>
+            <if test="batchId != null and batchId != '' ">#{batchId},</if>
          </trim>
     </insert>