[新增] 上传报告流程开发

adc-da-sys/src/main/java/com/adc/da/sys/controller/UserEOController.java

@@ -4,7 +4,9 @@ import com.adc.da.base.web.BaseController;
 import com.adc.da.excel.poi.excel.ExcelImportUtil;
 import com.adc.da.excel.poi.excel.entity.ImportParams;
 import com.adc.da.sys.constant.SysConstants;
+import com.adc.da.sys.dao.mysql.UserOrgEODao;
 import com.adc.da.sys.entity.UserEO;
+import com.adc.da.sys.entity.UserOrgEO;
 import com.adc.da.sys.service.iservice.IUserEoService;
 import com.adc.da.sys.util.EncryptUtil;
 import com.adc.da.sys.util.RSAUtil;
@@ -14,6 +16,7 @@ import com.adc.da.util.http.ResponseMessage;
 import com.adc.da.util.http.Result;
 import com.adc.da.util.utils.FileUtil;
 import com.adc.da.util.utils.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.gson.Gson;
 import com.google.gson.JsonElement;
@@ -35,6 +38,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -47,6 +51,8 @@ public class UserEOController extends BaseController<UserEO> {
     @Resource
     private IUserEoService userEOService;
 
+    private UserOrgEODao userOrgEODao;
+
     @Value("${isPassEncrypted}")
     private boolean isPassEncrypted;
 
@@ -112,7 +118,20 @@ public class UserEOController extends BaseController<UserEO> {
 
 
         userEOService.save(eo);
-
+        //保存部门
+        LambdaQueryWrapper<UserOrgEO> userOrgEOLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        userOrgEOLambdaQueryWrapper.eq(UserOrgEO::getUserId,eo.getUsid());
+        userOrgEODao.delete(userOrgEOLambdaQueryWrapper);
+        String orgId = eo.getOrgId();
+        String[] split = orgId.split(",");
+        List<UserOrgEO> userOrgEOS = new ArrayList<>();
+        for (String s : split) {
+            UserOrgEO userOrgEO = new UserOrgEO();
+            userOrgEO.setUserId(eo.getUsid());
+            userOrgEO.setOrgId(s);
+            userOrgEOS.add(userOrgEO);
+        }
+        userOrgEODao.insertBatch(userOrgEOS);
         return Result.success();
     }
 

adc-da-sys/src/main/java/com/adc/da/sys/entity/UserEO.java

@@ -97,6 +97,8 @@ public class UserEO extends BaseEntity implements Serializable {
     @TableField("USNAME")
     private String usname;
 
+    @TableField(exist = false)
+    private String orgId;
 
     /**
      * 角色ID列表
@@ -110,6 +112,12 @@ public class UserEO extends BaseEntity implements Serializable {
     @TableField(exist = false)
     private List<RoleEO> roleEOList = new ArrayList<>();
 
+    /**
+     * 部门EO列表
+     */
+    @TableField(exist = false)
+    private List<RoleEO> orgList = new ArrayList<>();
+
     @TableField(exist = false)
     private String roleId;
 

adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml

@@ -57,6 +57,10 @@
             <result column="name" property="name"/>
             <result column="remarks" property="remarks"/>
         </collection>
+        <collection property="orgList" ofType="com.adc.da.sys.entity.OrgEO">
+            <id column="id" property="id"/>
+            <result column="org_name" property="orgName"/>
+        </collection>
     </resultMap>
 
 <!--    包含用户基本数据，角色数据，组织机构数据等-->
@@ -93,10 +97,19 @@
     <!--获取用户角色信息-->
     <select id="getUserWithRoles" resultMap="UserRoleMap" parameterType="java.lang.String">
         select
-        <include refid="User_Role_List"/>
+            u.*, r.id as id,
+            r.data_scope as dataScope,
+            r.del_flag as r_delFlag,
+            r.is_default as isDefault,
+            r.name as name,
+            r.remarks as remarks,
+            org.id as orgId,
+            org.org_name
         from TS_USER u
         left join TR_USER_ROLE ur on u.usid = ur.user_id
         left join TS_ROLE r on ur.role_id = r.id
+        left join TR_USER_org uo on u.usid = uo.user_id
+        left join TS_org org on uo.org_id = org.id and org.status = 1
         where u.usid = #{id}
     </select>