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/service/IOrgUsrService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.OrgMenuVo;
+import com.yeejoin.amos.boot.module.jcs.api.vo.OrgUsrVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -15,12 +19,65 @@ import java.util.Map;
  * @date 2021-06-18
  */
 public interface IOrgUsrService {
+	/**
+	 * 查询上级单位
+	 * @param parent_id
+	 * @return
+	 */
     String selectUpUnitByParam(String parent_id);
 
+	/**
+	 * 获取父级
+	 * @param topId
+	 * @param entityList
+	 * @param packageURL
+	 * @param IDMethodName
+	 * @param IDHierarchy
+	 * @param NAMEMethodName
+	 * @param PARENTIDMethodName
+	 * @param OrgTypeMethodName
+	 * @return
+	 * @throws Exception
+	 */
 	List<OrgMenuVo> getTree(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
 							String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
 
+	/**
+	 * 获取子数据集合
+	 * @param topId
+	 * @param entityList
+	 * @param packageURL
+	 * @param IDMethodName
+	 * @param IDHierarchy
+	 * @param NAMEMethodName
+	 * @param PARENTIDMethodName
+	 * @param OrgTypeMethodName
+	 * @return
+	 * @throws Exception
+	 */
 	List<OrgMenuVo> getSub(Long topId, Collection entityList, String packageURL, String IDMethodName, int IDHierarchy,
 			String NAMEMethodName, String PARENTIDMethodName, String OrgTypeMethodName) throws Exception;
-	 List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception;
+
+	/**
+	 * 组装融合调度单位人员信息
+	 * @param ids
+	 * @return
+	 * @throws Exception
+	 */
+	List<Map<String, Object>> returnCompanyPersonMsg(List<Long> ids) throws Exception;
+
+	/**
+	 * 获取动态表单数据
+	 * @param queryWrapper
+	 * @return
+	 * @throws Exception
+	 */
+	List<FormValue> getFormValue(QueryWrapper queryWrapper) throws Exception;
+
+	/**
+	 * 保存 机构/部门/人员基本信息
+	 * @param
+	 * @throws Exception
+	 */
+	void saveOrgUsr (OrgUsr oriOrgUsr,Long id) throws Exception;;
 }

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

@@ -52,8 +52,4 @@ public class OrgUsrDownloadTemplateVO {
     @ApiModelProperty(value = "归属机构/部门/人员")
     private String parentId;
 
-    @Excel(name = "amos中公司/部门ID",width = 30)
-    @ApiModelProperty(value = "扩展属性1")
-    private String orgExpandAttr1;
-
 }

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

@@ -13,6 +13,8 @@ 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 org.apache.commons.lang3.StringUtils;
@@ -108,17 +110,31 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
-    public ResponseModel<Object> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentVo OrgDepartmentVo, @PathVariable Long id) {
-        // 修改人员信息
+    public ResponseModel<Object> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgDepartmentVo OrgDepartmentVo, @PathVariable Long id) throws Exception {
+        // 修改部门信息
         OrgUsr orgUsr = new OrgUsr();
-        BeanUtils.copyProperties(OrgDepartmentVo,orgUsr);
-        iOrgUsrService.updateById(orgUsr);
+        OrgUsr oriOrgUsr = iOrgUsrService.getById(id);
+        BeanUtils.copyProperties(OrgDepartmentVo, orgUsr);
+        iOrgUsrService.saveOrgUsr(oriOrgUsr,id);
         // 动态表单
         List<AlertFormValue> alertFromValuelist = OrgDepartmentVo.getAlertFormValue();
         // 填充主键
         alertFromValuelist.stream().forEach(alertFromValue -> {
             alertFromValue.setAlertCalledId(orgUsr.getSequenceNbr());
         });
+        List<AlertFromValueDto> formList = iAlertFromValueService.queryByCalledId(orgUsr.getSequenceNbr());
+
+        for (AlertFormValue dis : alertFromValuelist) {
+            for (AlertFromValueDto src : formList) {
+                if (dis.getAlertFormId() == src.getAlertFormId()) {
+                    dis.setSequenceNbr(src.getSequenceNbr());
+                    dis.setRecDate(new Date());
+                    dis.setRecUserId(oriOrgUsr.getRecUserId());
+                    dis.setRecUserName(oriOrgUsr.getRecUserName());
+                    break;
+                }
+            }
+        }
         // 保存动态表单数据
         iAlertFromValueService.updateBatchById(alertFromValuelist);
         return ResponseHelper.buildResponse(null);
@@ -134,24 +150,26 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取部门详情", notes = "获取部门详情")
-    public ResponseModel<OrgDepartmentFormVo> selectById(HttpServletRequest request, @PathVariable Long id) {
+    public ResponseModel<OrgDepartmentFormVo> selectById(HttpServletRequest request, @PathVariable Long id) throws Exception {
         QueryWrapper<AlertFormValue> queryWrapper = new QueryWrapper<>();
         OrgUsr orgUsr = iOrgUsrService.getById(id);
         queryWrapper.eq("alert_called_id", id);
         // 动态表单数据
-        List<AlertFormValue> list = iAlertFromValueService.list(queryWrapper);
-        List<FormValue> formValue = new ArrayList<FormValue>();
-        for (AlertFormValue alertFormValue : list) {
-            if (alertFormValue.getFieldValueCode() == null){
-                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(), alertFormValue.getIsBlock());
+        List<AlertFormValueVo> list = iAlertFromValueService.listByCalledId(id);
+        List<FormValue> formValue = new ArrayList();
+        for (AlertFormValueVo alertFormValue : list) {
+            if (alertFormValue.getFieldValueCode() == null) {
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), alertFormValue.getFieldType(),
+                        alertFormValue.getFieldValue(), alertFormValue.getIsBlock());
                 formValue.add(value);
-            }else {
-                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValueCode(), alertFormValue.getIsBlock());
+            } else {
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), alertFormValue.getFieldType(),
+                        alertFormValue.getFieldValueCode(), alertFormValue.getIsBlock());
                 formValue.add(value);
             }
         }
         OrgDepartmentFormVo orgDepartmentFormVo = new OrgDepartmentFormVo();
-        BeanUtils.copyProperties(orgUsr,orgDepartmentFormVo);
+        BeanUtils.copyProperties(orgUsr, orgDepartmentFormVo);
         orgDepartmentFormVo.setDynamicFormAlert(formValue);
         return ResponseHelper.buildResponse(orgDepartmentFormVo);
     }
@@ -165,7 +183,7 @@ public class OrgDepartmentController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyTree", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取部门树", notes = "获取部门树")
-    public ResponseModel< List<OrgMenuVo>> selectCompanyTree() throws Exception {
+    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_DEPARTMENT);
@@ -229,9 +247,9 @@ public class OrgDepartmentController {
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "download-template/", method = RequestMethod.POST)
-    @ApiOperation(httpMethod = "POST", value = "根据类型导出模板", notes = "根据类型导出模板")
-    public ResponseModel<Object> downloadTemplate(HttpServletResponse response, @RequestBody List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO) throws UnsupportedEncodingException {
+    @RequestMapping(value = "download-template", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "导出模板", notes = "导出模板")
+    public ResponseModel downloadTemplate(HttpServletResponse response, @RequestBody List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO) throws UnsupportedEncodingException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
         ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "部门信息", "部门信息", OrgUsrDownloadTemplateVO.class, simpleDateFormat.format(new Date()) + ".xls", response);
         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/OrgPersonController.java

@@ -110,17 +110,12 @@ public class OrgPersonController {
 	@RequestMapping(value = "/{id}", method = RequestMethod.PUT)
 	@ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
 	public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgPersonVo OrgPersonVo,
-			@PathVariable Long id) {
+			@PathVariable Long id) throws Exception {
 		// 修改人员信息
 		OrgUsr orgUsr = new OrgUsr();
 		OrgUsr oriOrgUsr = iOrgUsrService.getById(id);
 		BeanUtils.copyProperties(OrgPersonVo, orgUsr);
-		orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
-		orgUsr.setSequenceNbr(id);
-		orgUsr.setRecDate(new Date());
-		orgUsr.setRecUserId(oriOrgUsr.getRecUserId());
-		orgUsr.setRecUserName(oriOrgUsr.getRecUserName());
-		iOrgUsrService.updateById(orgUsr);
+		iOrgUsrService.saveOrgUsr(oriOrgUsr,id);
 		// 动态表单
 		List<AlertFormValue> alertFromValuelist = OrgPersonVo.getAlertFormValue();
 		// 填充主键
@@ -179,6 +174,7 @@ public class OrgPersonController {
 		return ResponseHelper.buildResponse(orgUsrFormVo);
 	}
 
+
 	/**
 	 * 获取人员树
 	 *
@@ -274,11 +270,27 @@ public class OrgPersonController {
 	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/download-template", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "导出人员模板", notes = "导出人员模板")
-	public ResponseModel downloadTemplate(HttpServletResponse response) throws UnsupportedEncodingException {
-		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
-		List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO = new ArrayList<>();
-		ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "人员信息", "人员信息", OrgUsrDownloadTemplateVO.class,
-				simpleDateFormat.format(new Date()) + ".xls", response);
-		return ResponseHelper.buildResponse(null);
+    public ResponseModel downloadTemplate(HttpServletResponse response, @RequestBody List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO) throws UnsupportedEncodingException {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
+        ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "人员信息", "人员信息", OrgUsrDownloadTemplateVO.class, simpleDateFormat.format(new Date()) + ".xls", response);
+        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));
+//    }
+
 }

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

@@ -13,6 +13,8 @@ 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;
@@ -111,17 +113,30 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.PUT)
     @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
-    public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrVo OrgUsrVo, @PathVariable Long id) {
+    public ResponseModel updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrVo OrgUsrVo, @PathVariable Long id) throws Exception {
         // 修改单位信息
         OrgUsr orgUsr = new OrgUsr();
-        BeanUtils.copyProperties(OrgUsrVo,orgUsr);
-        iOrgUsrService.updateById(orgUsr);
+        OrgUsr oriOrgUsr = iOrgUsrService.getById(id);
+        BeanUtils.copyProperties(OrgUsrVo, orgUsr);
+        iOrgUsrService.saveOrgUsr(oriOrgUsr,id);
         // 动态表单
         List<AlertFormValue> alertFromValuelist = OrgUsrVo.getAlertFormValue();
         // 填充主键
         alertFromValuelist.stream().forEach(alertFromValue -> {
             alertFromValue.setAlertCalledId(orgUsr.getSequenceNbr());
         });
+        List<AlertFromValueDto> formList = iAlertFromValueService.queryByCalledId(orgUsr.getSequenceNbr());
+        for (AlertFormValue dis : alertFromValuelist) {
+            for (AlertFromValueDto src : formList) {
+                if (dis.getAlertFormId() == src.getAlertFormId()) {
+                    dis.setSequenceNbr(src.getSequenceNbr());
+                    dis.setRecDate(new Date());
+                    dis.setRecUserId(oriOrgUsr.getRecUserId());
+                    dis.setRecUserName(oriOrgUsr.getRecUserName());
+                    break;
+                }
+            }
+        }
         // 保存动态表单数据
         iAlertFromValueService.updateBatchById(alertFromValuelist);
         return ResponseHelper.buildResponse(null);
@@ -137,19 +152,21 @@ public class OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取单位详情", notes = "获取单位详情")
-    public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) {
+    public ResponseModel selectById(HttpServletRequest request, @PathVariable Long id) throws Exception {
         OrgUsr orgUsr = iOrgUsrService.getById(id);
         QueryWrapper queryWrapper = new QueryWrapper<OrgUsr>();
         queryWrapper.eq("alert_called_id", id);
         // 动态表单数据
-        List<AlertFormValue> list = iAlertFromValueService.list(queryWrapper);
+        List<AlertFormValueVo> list = iAlertFromValueService.listByCalledId(id);
         List<FormValue> formValue = new ArrayList();
-        for (AlertFormValue alertFormValue : list) {
-            if (alertFormValue.getFieldValueCode() == null){
-                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(), alertFormValue.getIsBlock());
+        for (AlertFormValueVo alertFormValue : list) {
+            if (alertFormValue.getFieldValueCode() == null) {
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), alertFormValue.getFieldType(),
+                        alertFormValue.getFieldValue(), alertFormValue.getIsBlock());
                 formValue.add(value);
-            }else {
-                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValueCode(), alertFormValue.getIsBlock());
+            } else {
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), alertFormValue.getFieldType(),
+                        alertFormValue.getFieldValueCode(), alertFormValue.getIsBlock());
                 formValue.add(value);
             }
         }
@@ -298,8 +315,8 @@ public class OrgUsrController extends BaseController {
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
-    @RequestMapping(value = "download-template/{type}", method = RequestMethod.POST)
-    @ApiOperation(httpMethod = "POST", value = "根据类型导出模板", notes = "根据类型导出模板")
+    @RequestMapping(value = "download-template", method = RequestMethod.POST)
+    @ApiOperation(httpMethod = "POST", value = "导出模板", notes = "导出模板")
     public ResponseModel downloadTemplate(HttpServletResponse response, @RequestBody List<OrgUsrDownloadTemplateVO> OrgUsrDownloadTemplateVO) throws UnsupportedEncodingException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
         ExcelUtils.exportExcel(OrgUsrDownloadTemplateVO, "单位信息", "单位信息", OrgUsrDownloadTemplateVO.class, simpleDateFormat.format(new Date()) + ".xls", response);

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

@@ -9,7 +9,9 @@ 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.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IOrgUsrService;
+import com.yeejoin.amos.boot.module.jcs.api.vo.FormValue;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgMenuVo;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -242,5 +245,31 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
         return companyPersonMsg;
     }
 
+    @Override
+    public List<FormValue> getFormValue(QueryWrapper queryWrapper) throws Exception {
+        List<AlertFormValue> list = alertFormValueServiceImpl.list(queryWrapper);
+        List<FormValue> formValue = new ArrayList();
+        for (AlertFormValue alertFormValue : list) {
+            if (alertFormValue.getFieldValueCode() == null){
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(), alertFormValue.getIsBlock());
+                formValue.add(value);
+            }else {
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValueCode(), alertFormValue.getIsBlock());
+                formValue.add(value);
+            }
+        }
+        return formValue;
+    }
+
+    @Override
+    public void saveOrgUsr(OrgUsr oriOrgUsr,Long id) throws Exception {
+        OrgUsr orgUsr = new OrgUsr();
+        orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
+        orgUsr.setSequenceNbr(id);
+        orgUsr.setRecDate(new Date());
+        orgUsr.setRecUserId(oriOrgUsr.getRecUserId());
+        orgUsr.setRecUserName(oriOrgUsr.getRecUserName());
+        updateById(orgUsr);
+    }
 
 }