逻辑迁移

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

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 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.AlertFormValueVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgMenuVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgPersonFormVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgPersonVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrFormVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrVo;
+import org.apache.poi.ss.formula.functions.T;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.servlet.http.HttpServletRequest;
@@ -109,4 +116,27 @@ public interface IOrgUsrService {
 	List<OrgUsr> selectCompanyDepartmentMsg();
 
 	void saveOrgUsr( OrgUsrVo OrgUsrVo) throws Exception;
+
+	void saveOrgPerson( OrgPersonVo OrgPersonVo) throws Exception;
+
+	void updateByIdOrgUsr(OrgUsrVo OrgUsrVo,Long id) throws Exception;
+
+	void updateByIdOrgPerson(OrgPersonVo OrgPersonVo,Long id) throws Exception;
+
+	OrgUsrFormVo selectCompanyById(Long id) throws Exception;
+
+	IPage bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception;
+
+	void saveDepartment(List<OrgDepartmentVo> OrgDepartmentVo, Long id)throws Exception;
+
+	void saveCompany(List<OrgUsrVo> OrgUsrVo)throws Exception;
+
+	OrgPersonFormVo selectPersonById(Long id) throws Exception;
+
+	OrgPersonFormVo selectPersonByIdDetail(Long id) throws Exception;
+
+
+	List<OrgMenuVo> selectPersonTree() throws Exception;
+
+	void savePersonList (List <OrgPersonVo> OrgPersonVo)throws Exception;
 }

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

@@ -16,6 +16,32 @@
     </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,

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

@@ -58,11 +58,8 @@ public class OrgPersonController {
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/save", method = RequestMethod.POST)
 	@ApiOperation(httpMethod = "POST", value = "新增人员信息", notes = "新增人员信息")
-	public ResponseModel saveOrgUsr(HttpServletRequest request, @RequestBody OrgPersonVo OrgPersonVo) {
-		OrgUsr orgUsr = new OrgUsr();
-		BeanUtils.copyProperties(OrgPersonVo, orgUsr);
-		orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
-		iOrgUsrService.saveOrgUsrAlertFormValue(orgUsr,OrgPersonVo.getAlertFormValue());
+	public ResponseModel saveOrgUsr(HttpServletRequest request, @RequestBody OrgPersonVo OrgPersonVo) throws Exception {
+		iOrgUsrService.saveOrgPerson(OrgPersonVo);
 		return ResponseHelper.buildResponse(null);
 	}
 
@@ -77,8 +74,7 @@ public class OrgPersonController {
 	@ApiOperation(httpMethod = "DELETE", value = "根据id删除", notes = "根据id删除")
 	public ResponseModel deleteById(HttpServletRequest request, @PathVariable Long id) {
 		// 删除时，只作逻辑删除
-		iOrgUsrService.update(
-				new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
+		iOrgUsrService.update(new UpdateWrapper<OrgUsr>().eq("sequence_nbr", id).set("is_delete", CommonConstant.IS_DELETE_01));
 		return ResponseHelper.buildResponse(null);
 	}
 
@@ -90,15 +86,8 @@ public class OrgPersonController {
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/{id}", method = RequestMethod.PUT)
 	@ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
-	public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonVo OrgPersonVo,
-			@PathVariable Long id) throws Exception {
-		// 修改人员信息
-		OrgUsr orgUsr = new OrgUsr();
-		OrgUsr oriOrgUsr = iOrgUsrService.getById(id);
-		BeanUtils.copyProperties(OrgPersonVo, orgUsr);
-		iOrgUsrService.saveOrgUsr(oriOrgUsr,id);
-		// 保存动态表单数据
-		iOrgUsrService.updateAlertFormValue(oriOrgUsr,orgUsr.getSequenceNbr(),OrgPersonVo.getAlertFormValue());
+	public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonVo OrgPersonVo, @PathVariable Long id) throws Exception {
+		iOrgUsrService.updateByIdOrgPerson(OrgPersonVo,id);
 		return ResponseHelper.buildResponse(null);
 	}
 
@@ -112,26 +101,14 @@ public class OrgPersonController {
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "获取人员详情", notes = "获取人员详情")
 	public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) throws Exception {
-		OrgUsr orgUsr = iOrgUsrService.getById(id);
-		// 动态表单数据
-		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);
+		return ResponseHelper.buildResponse(iOrgUsrService.selectPersonById(id));
 	}
 	
 	@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);
+		return ResponseHelper.buildResponse(iOrgUsrService.selectPersonByIdDetail(id));
 	}
 	
 	/**
@@ -159,13 +136,8 @@ public class OrgPersonController {
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/companyTree", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "获取人员树", notes = "获取人员树")
-	public ResponseModel 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_PERSON);
-		Collection<OrgUsr> list = iOrgUsrService.listByMap(columnMap);
-		return ResponseHelper.buildResponse(iOrgUsrService.getTree(null, list, OrgUsr.class.getName(), "getSequenceNbr",
-				2, "getBizOrgName", "getParentId", "getBizOrgType"));
+	public ResponseModel selectPersonTree() throws Exception {
+		return ResponseHelper.buildResponse(iOrgUsrService.selectPersonTree());
 	}
 
 	/**
@@ -189,14 +161,12 @@ public class OrgPersonController {
 	@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) {
+	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);
-		iOrgUsrService.listByMap(columnMap);
-		return ResponseHelper.buildResponse(null);
+		return ResponseHelper.buildResponse(iOrgUsrService.listByMap(columnMap));
 	}
 
 	/**
@@ -221,15 +191,10 @@ public class OrgPersonController {
 	 * @return
 	 */
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-	@RequestMapping(value = "/saveDepartment", method = RequestMethod.POST)
+	@RequestMapping(value = "/savePerson", 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());
-		}
+	public ResponseModel savePerson(HttpServletRequest request, @RequestBody List<OrgPersonVo> OrgPersonVo) throws Exception {
+		iOrgUsrService.savePersonList(OrgPersonVo);
 		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

@@ -5,16 +5,14 @@ import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.HashMap;
+
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgMenuVo;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -34,10 +32,8 @@ 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.OrgUsr;
-import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgDepartmentVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrDownloadTemplateVO;
-import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrFormVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrVo;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.AlertFormValueServiceImpl;
 import com.yeejoin.amos.boot.module.jcs.biz.service.impl.OrgUsrServiceImpl;
@@ -99,13 +95,7 @@ public class OrgUsrController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
     public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrVo OrgUsrVo, @PathVariable Long id) throws Exception {
-        // 修改单位信息
-        OrgUsr orgUsr = new OrgUsr();
-        OrgUsr oriOrgUsr = iOrgUsrService.getById(id);
-        BeanUtils.copyProperties(OrgUsrVo, orgUsr);
-        iOrgUsrService.saveOrgUsr(oriOrgUsr,id);
-        // 保存动态表单数据
-        iOrgUsrService.updateAlertFormValue(oriOrgUsr,orgUsr.getSequenceNbr(),OrgUsrVo.getAlertFormValue());
+       iOrgUsrService.updateByIdOrgUsr(OrgUsrVo,id);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -120,13 +110,7 @@ public class OrgUsrController extends BaseController {
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取单位详情", notes = "获取单位详情")
     public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) throws Exception {
-        OrgUsr orgUsr = iOrgUsrService.getById(id);
-        // 动态表单数据
-        List<FormValue> formValue = iOrgUsrService.getFormValue(id);
-        OrgUsrFormVo orgUsrFormVo = new OrgUsrFormVo();
-        orgUsrFormVo.setDynamicFormAlert(formValue);
-        BeanUtils.copyProperties(orgUsr, orgUsrFormVo);
-        return ResponseHelper.buildResponse(orgUsrFormVo);
+       return ResponseHelper.buildResponse(iOrgUsrService.selectCompanyById(id));
     }
 
 
@@ -139,20 +123,8 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/selectByBizOrgType/{bizOrgType}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据bizOrgType分页查询", notes = "根据bizOrgType分页查询")
-    public ResponseModel bizOrgTypeListPage(String pageNum, String pageSize, @PathVariable String bizOrgType) {
-        Map<String, Object> columnMap = new HashMap<>();
-        columnMap.put("is_delete", CommonConstant.IS_DELETE_00);
-        columnMap.put("biz_org_type", bizOrgType);
-        Page<OrgUsr> pageBean = new Page();
-        if (StringUtils.isBlank(pageNum) || StringUtils.isBlank(pageSize)) {
-            pageBean = new Page<>(0, Long.MAX_VALUE);
-        } else {
-            pageBean = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-        }
-        QueryWrapper queryWrapper = new QueryWrapper<OrgUsr>();
-        queryWrapper.allEq(columnMap);
-        queryWrapper.orderByAsc("sequence_nbr");
-        return ResponseHelper.buildResponse(iOrgUsrService.page(pageBean,queryWrapper ));
+    public ResponseModel bizOrgTypeListPage(String pageNum, String pageSize, @PathVariable String bizOrgType) throws Exception {
+        return ResponseHelper.buildResponse(iOrgUsrService.page( iOrgUsrService.bizOrgTypeListPage(pageNum,pageSize,bizOrgType)));
     }
 
 
@@ -166,9 +138,6 @@ public class OrgUsrController extends BaseController {
     @RequestMapping(value = "/companyTree", method = RequestMethod.GET)
     @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.selectCompanyDepartmentMsg(), OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
         return ResponseHelper.buildResponse(menus);
     }
@@ -229,17 +198,8 @@ 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 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());
-        }
+    public ResponseModel saveDepartment(HttpServletRequest request, @RequestBody List<OrgDepartmentVo> OrgDepartmentVo, @PathVariable Long id) throws Exception {
+        iOrgUsrService.saveDepartment(OrgDepartmentVo,id);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -251,13 +211,8 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/saveCompany", 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());
-        }
+    public ResponseModel saveCompany(HttpServletRequest request, @RequestBody List<OrgUsrVo> OrgUsrVo) throws Exception {
+       iOrgUsrService.saveCompany(OrgUsrVo);
        return ResponseHelper.buildResponse(null);
     }