Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/mapper/OrgUsrMapper.java

@@ -16,12 +16,9 @@ import org.apache.ibatis.annotations.Param;
 * @date 2021-06-18
 */
 public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
-    /**
-     * 根据parent_id查上级机构名
-     * @param biz_org_code
-     * @return
-     */
     String selectUpUnitByParam(@Param("biz_org_code")String biz_org_code);
 
 	List<Map<String, Object>> selectPersonList(Map<String, Object> map);
+
+	List<OrgUsr> selectCompanyDepartmentMsg();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IOrgUsrService.java

@@ -103,4 +103,6 @@ public interface IOrgUsrService {
 	 * @throws Exception
 	 */
 	Map<String, Object> selectForShowById (OrgUsr orgUsr,Long id) throws Exception;
+
+	List<OrgUsr> selectCompanyDepartmentMsg();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgMenuVo.java

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.experimental.Accessors;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgPersonFormVo.java

@@ -49,6 +49,8 @@ public class OrgPersonFormVo extends BaseEntity{
 
     @ApiModelProperty(value = "归属机构/部门/人员")
     private String parentId;
+    @ApiModelProperty(value = "归属机构/部门/人员")
+    private String parentName;
 
     @ApiModelProperty(value = "动态表单值")
     private List<FormValue> dynamicFormAlert;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/vo/OrgPersonVo.java

@@ -4,7 +4,6 @@ import java.io.Serializable;
 import java.util.List;
 
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
-import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -14,29 +14,18 @@
         </if>
 
     </select>
-    
-    
-     <select id="selectPersonList" resultType="Map">
-     	select * from (
-         SELECT
-			DISTINCT
-			    u.sequence_nbr sequenceNbr,
-				u.biz_org_name bizOrgName,
-				u.biz_org_code bizOrgCode,
-				<if test="fields != null">
-				   <foreach collection="fields" item="item" separator=",">MAX(case f.field_code when #{item} then v.field_value  end) ${item}</foreach>
-				</if>
-			FROM
-				cb_org_usr u LEFT JOIN 
-				jc_alert_form_value v on u.sequence_nbr = v.alert_called_id 
-			LEFT JOIN jc_alert_form f ON f.sequence_nbr = v.alert_form_id
-			where u.parent_id = #{parentId}
-			AND u.biz_org_type = #{bizOrgType}
-			GROUP BY 
-			u.sequence_nbr ,
-			u.biz_org_name ,
-			u.biz_org_code 
-			)a where a.sequenceNbr is not null
-			LIMIT #{pageNum}, #{pageSize}
-    </select>
+
+
+	<select id="selectCompanyDepartmentMsg" resultType="com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr">
+		SELECT
+		sequence_nbr,
+		biz_org_name,
+		biz_org_type,
+		parent_id
+		FROM
+		`cb_org_usr`
+		WHERE
+		is_delete = 0
+		and biz_org_type = "COMPANY" or biz_org_type =  "DEPARTMENT"
+	</select>
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgDepartmentController.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
 import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
@@ -13,11 +12,9 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromValueDto;
-import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormValueVo;
+
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentFormVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgMenuVo;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrFormVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -37,7 +34,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.utils.ExcelUtils;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentVo;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgPersonController.java

@@ -2,8 +2,6 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
 import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
@@ -13,25 +11,18 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentFormVo;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.utils.ExcelUtils;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
@@ -126,9 +117,22 @@ public class OrgPersonController {
 		List<FormValue> formValue = iOrgUsrService.getFormValue(id);
 		OrgPersonFormVo orgPersonFormVo = new OrgPersonFormVo(formValue);
 		BeanUtils.copyProperties(orgUsr, orgPersonFormVo);
+		orgPersonFormVo.setParentName(iOrgUsrService.getById(orgUsr.getParentId()).getBizOrgName());
 		return ResponseHelper.buildResponse(orgPersonFormVo);
 	}
 	
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/{id}/detail", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "获取人员详情", notes = "获取人员详情")
+	public ResponseModel selectByIdDetail(HttpServletRequest request, @PathVariable Long id) throws Exception {
+		OrgUsr orgUsr = iOrgUsrService.getById(id);
+		// 动态表单数据
+		List<FormValue> formValue = iOrgUsrService.getFormValueDetail(id);
+		OrgPersonFormVo orgPersonFormVo = new OrgPersonFormVo(formValue);
+		BeanUtils.copyProperties(orgUsr, orgPersonFormVo);
+		orgPersonFormVo.setParentName(iOrgUsrService.getById(orgUsr.getParentId()).getBizOrgName());
+		return ResponseHelper.buildResponse(orgPersonFormVo);
+	}
 	
 	/**
 	 * 根据id查询人员
@@ -178,7 +182,7 @@ public class OrgPersonController {
 
 	/**
 	 *
-	 *
+	 * 根据orgCode查询
 	 * @param orgCode
 	 * @return
 	 */
@@ -211,21 +215,21 @@ public class OrgPersonController {
         return ResponseHelper.buildResponse(null);
 	}
 
-//    /**
-//     *
-//     *
-//     * @param orgCode
-//     * @return
-//     */
-//    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-//    @RequestMapping(value = "/{orgCode}/users", method = RequestMethod.GET)
-//    @ApiOperation(httpMethod = "GET", value = "根据orgCode查询人员", notes = "根据orgCode查询人员")
-//    public ResponseModel selectUsersByOrgCode(HttpServletRequest request, String pageNum, String pageSize, @PathVariable Long orgCode) {
-//        Map<String, Object> columnMap = new HashMap<>();
-//        columnMap.put("is_delete",CommonConstant.IS_DELETE_00);
-//        columnMap.put("biz_org_code", orgCode);
-//        columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
-//        return ResponseHelper.buildResponse( iOrgUsrService.listByMap(columnMap));
-//    }
-
+	/**
+	 * 导入人员信息
+	 *
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/saveDepartment", method = RequestMethod.POST)
+	@ApiOperation(httpMethod = "POST", value = "导入人员信息", notes = "导入人员信息")
+	public ResponseModel saveCompany(HttpServletRequest request, @RequestBody List<OrgPersonVo> OrgPersonVo) {
+		for (int i = 0; i < OrgPersonVo.size(); i++) {
+			OrgUsr orgUsr = new OrgUsr();
+			BeanUtils.copyProperties(OrgPersonVo.get(i), orgUsr);
+			orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
+			iOrgUsrService.saveOrgUsrAlertFormValue(orgUsr,OrgPersonVo.get(i).getAlertFormValue());
+		}
+		return ResponseHelper.buildResponse(null);
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/OrgUsrController.java

@@ -3,7 +3,6 @@ package com.yeejoin.amos.boot.module.jcs.biz.controller;
 
 import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
@@ -13,8 +12,6 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromValueDto;
-import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormValueVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgMenuVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -36,7 +33,6 @@ import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.ExcelUtils;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentVo;
@@ -164,19 +160,19 @@ public class OrgUsrController extends BaseController {
 
 
     /**
-     * 获取单位树
      *
+     * 获取单位部门树
      * @param
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyTree", method = RequestMethod.GET)
-    @ApiOperation(httpMethod = "GET", value = "获取单位树", notes = "获取单位树")
+    @ApiOperation(httpMethod = "GET", value = "获取单位部门树", notes = "获取单位部门树")
     public ResponseModel< List<OrgMenuVo>>selectCompanyTree() throws Exception {
         Map<String, Object> columnMap = new HashMap<>();
         columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
         columnMap.put("biz_org_type", CommonConstant.BIZ_ORG_TYPE_COMPANY);
-        List<OrgMenuVo> menus = iOrgUsrService.getTree(null, iOrgUsrService.listByMap(columnMap), OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
+        List<OrgMenuVo> menus = iOrgUsrService.getTree(null, iOrgUsrService.selectCompanyDepartmentMsg(), OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
         return ResponseHelper.buildResponse(menus);
     }
 
@@ -236,15 +232,35 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/saveDepartment", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "导入部门信息", notes = "导入部门信息")
-    public ResponseModel saveDepartment(HttpServletRequest request, @RequestBody OrgDepartmentVo OrgDepartmentVo, @PathVariable Long id) {
-        // 导入部门信息的前提条件：单位信息已经存在
-        if (iOrgUsrService.getById(id) == null) {
-            return ResponseHelper.buildResponse("单位信息需存在才可导入部门信息");
+    public ResponseModel saveDepartment(HttpServletRequest request, @RequestBody List<OrgDepartmentVo> OrgDepartmentVo, @PathVariable Long id) {
+        for (int i = 0; i < OrgDepartmentVo.size(); i++) {
+            // 导入部门信息的前提条件：单位信息已经存在
+            if (iOrgUsrService.getById(id) == null) {
+                return ResponseHelper.buildResponse("单位信息需存在才可导入部门信息");
+            }
+            OrgUsr orgUsr = new OrgUsr();
+            BeanUtils.copyProperties(OrgDepartmentVo.get(i), orgUsr);
+            orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
+            iOrgUsrService.saveOrgUsrAlertFormValue(orgUsr,OrgDepartmentVo.get(i).getAlertFormValue());
+        }
+        return ResponseHelper.buildResponse(null);
+    }
+
+    /**
+     * 导入单位信息
+     *
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/saveDepartment", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "导入单位信息", notes = "导入单位信息")
+    public ResponseModel saveCompany(HttpServletRequest request, @RequestBody List<OrgUsrVo> OrgUsrVo) {
+        for (int i = 0; i < OrgUsrVo.size(); i++) {
+            OrgUsr orgUsr = new OrgUsr();
+            BeanUtils.copyProperties(OrgUsrVo.get(i), orgUsr);
+            orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
+            iOrgUsrService.saveOrgUsrAlertFormValue(orgUsr,OrgUsrVo.get(i).getAlertFormValue());
         }
-        OrgUsr orgUsr = new OrgUsr();
-        BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
-        orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_DEPARTMENT);
-        iOrgUsrService.saveOrgUsrAlertFormValue(orgUsr,OrgDepartmentVo.getAlertFormValue());
         return ResponseHelper.buildResponse(null);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrgUsrServiceImpl.java

@@ -21,7 +21,6 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 
 import java.lang.reflect.Method;
@@ -320,6 +319,18 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
         }
         return formValue;
     }
+    
+    public List<FormValue> getFormValueDetail(Long id) throws Exception {
+      // 动态表单数据
+        List<AlertFormValueVo> list = iAlertFromValueService.listByCalledId(id);
+        List<FormValue> formValue = new ArrayList();
+        for (AlertFormValueVo alertFormValue : list) {
+        	FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), alertFormValue.getFieldType(),
+                    alertFormValue.getFieldValue(), alertFormValue.getIsBlock());
+            formValue.add(value);
+        }
+        return formValue;
+    }
 
     @Override
     public void saveOrgUsr(OrgUsr oriOrgUsr,Long id) throws Exception {
@@ -379,4 +390,9 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
         }
         return result;
     }
+
+    @Override
+    public List<OrgUsr> selectCompanyDepartmentMsg() {
+        return this.baseMapper.selectCompanyDepartmentMsg();
+    }
 }