Merge branch 'GDD' into developer

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dto/BaseDto.java

@@ -5,6 +5,8 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 /**
  * 基础DTO
  * @author kinky
@@ -24,4 +26,10 @@ public class BaseDto implements Serializable{
     protected Date recDate;
 	@ApiModelProperty(value = "更新人")
     protected String recUserId;
+	
+    /**
+     * 是否删除
+     */
+    @TableField(value = "is_delete")
+    private Boolean isDelete;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/AlertFromDto.java

@@ -33,4 +33,13 @@ public class AlertFromDto extends BaseDto{
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 
+    @ApiModelProperty(value = "是否一行显示")
+    private Boolean isBlock;
+    //新加排序字段
+    @ApiModelProperty(value = "排序字段")
+    private int sortNum;
+    
+    public Boolean getIsBlock() {
+    	return this.isBlock;
+    }
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/entity/AlertForm.java

@@ -44,7 +44,7 @@ public class AlertForm extends BaseEntity {
     private String fieldValueCode;
 
     @ApiModelProperty(value = "是否一行显示")
-    private boolean isBlock;
+    private Boolean isBlock;
     //新加排序字段
     @ApiModelProperty(value = "排序字段")
     private int sortNum;

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

@@ -2,6 +2,10 @@ package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jcs.api.entity.OrgUsr;
+
+import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 
 
@@ -18,4 +22,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
      * @return
      */
     String selectUpUnitByParam(@Param("biz_org_code")String biz_org_code);
+
+	List<Map<String, Object>> selectPersonList(Map<String, Object> map);
 }

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -18,18 +19,41 @@ import java.util.List;
 @Accessors(chain = true)
 @TableName("cb_org_usr")
 @ApiModel(value="OrgUsrVo", description="机构/部门/人员表")
-public class OrgUsrFormVo {
+public class OrgUsrFormVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "单位id")
     private Long id;
+    @ApiModelProperty(value = "单位id")
+    protected Long sequenceNbr;
 
     @ApiModelProperty(value = "单位名称")
     private String currentUnit;
 
     @ApiModelProperty(value = "归属机构/部门")
     private String parentId;
+    
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "amos中公司/部门ID")
+    private String amosOrgId;
+
+    @ApiModelProperty(value = "amos中公司/部门编码")
+    private String amosOrgCode;
+
+    @ApiModelProperty(value = "机构类型`")
+    private String bizOrgType;
+
+    @ApiModelProperty(value = "所属建筑名称")
+    private String buildName;
+
+    @ApiModelProperty(value = "所属建筑ID")
+    private String buildId;
 
     private Integer personNum;
 

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

@@ -14,4 +14,23 @@
         </if>
 
     </select>
+    
+    
+     <select id="selectPersonList" resultType="Map">
+        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 v.field_code when #{item} then v.field_value  end) ${item}</foreach>
+				</if>
+			FROM
+				cb_org_usr u,
+				jc_alert_form_value v
+			LEFT JOIN jc_alert_form f ON f.sequence_nbr = v.alert_form_id
+			where u.sequence_nbr = v.alert_called_id
+			and v.alert_type_code = #{alertTypeCode}
+			LIMIT #{pageNum}, #{pageSize}
+    </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/OrgPersonController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 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;
@@ -131,6 +132,7 @@ public class OrgPersonController {
 					dis.setRecDate(new Date());
 					dis.setRecUserId(oriOrgUsr.getRecUserId());
 					dis.setRecUserName(oriOrgUsr.getRecUserName());
+					dis.setAlertTypeCode(src.getAlertTypeCode());
 					break;
 				}
 			}
@@ -173,6 +175,31 @@ public class OrgPersonController {
 		orgUsrFormVo.setDynamicFormAlert(formValue);
 		return ResponseHelper.buildResponse(orgUsrFormVo);
 	}
+	
+	
+	/**
+	 * 根据id查询人员
+	 *
+	 * @param id
+	 * @return
+	 */
+	@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/show/{id}", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "获取人员详情", notes = "获取人员详情")
+	public ResponseModel selectForShowById(HttpServletRequest request, @PathVariable Long id) {
+		OrgUsr orgUsr = iOrgUsrService.getById(id);
+		QueryWrapper queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("alert_called_id", id);
+		// 动态表单数据
+		List<AlertFormValueVo> list = iAlertFromValueService.listByCalledId(id);
+		List<FormValue> formValue = new ArrayList();
+		Map<String, Object> result = Bean.BeantoMap(orgUsr);
+		for (AlertFormValueVo alertFormValue : list) {
+			result.put(alertFormValue.getFieldCode(), alertFormValue.getFieldValue());
+		}
+
+		return ResponseHelper.buildResponse(result);
+	}
 
 
 	/**
@@ -202,43 +229,7 @@ public class OrgPersonController {
 	@RequestMapping(value = "/list", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "列表分页查询", notes = "列表分页查询")
 	public ResponseModel<Object> listPage(String pageNum, String pageSize, OrgUsr orgUsr) {
-
-		Page<OrgUsr> pageBean;
-		QueryWrapper<OrgUsr> orgUsrQueryWrapper = new QueryWrapper<>();
-		Class<? extends OrgUsr> aClass = orgUsr.getClass();
-		Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
-			try {
-				field.setAccessible(true);
-				Object o = field.get(orgUsr);
-				if (o != null) {
-					Class<?> type = field.getType();
-					String name = NameUtils.camel2Underline(field.getName());
-					if (type.equals(Integer.class)) {
-						Integer fileValue = (Integer) field.get(orgUsr);
-						orgUsrQueryWrapper.eq(name, fileValue);
-					} else if (type.equals(Long.class)) {
-						Long fileValue = (Long) field.get(orgUsr);
-						orgUsrQueryWrapper.eq(name, fileValue);
-					} else if (type.equals(String.class)) {
-						String fileValue = (String) field.get(orgUsr);
-						orgUsrQueryWrapper.eq(name, fileValue);
-					} else {
-						String fileValue = (String) field.get(orgUsr);
-						orgUsrQueryWrapper.eq(name, fileValue);
-					}
-				}
-			} catch (Exception e) {
-			}
-		});
-		IPage<OrgUsr> 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));
-		}
-		orgUsrQueryWrapper.eq("biz_org_type", CommonConstant.BIZ_ORG_TYPE_PERSON);
-		page = iOrgUsrService.page(pageBean, orgUsrQueryWrapper);
-		return ResponseHelper.buildResponse(page);
+		return ResponseHelper.buildResponse(iOrgUsrService.pagePerson(pageNum, pageSize, orgUsr));
 	}
 
 	/**

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

@@ -5,6 +5,8 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,7 +45,7 @@ public class AlertFormServiceImpl extends BaseService<AlertFromDto,AlertForm,Ale
 		for (AlertForm alertFrom : alertFormValue) {
 			if(alertFrom.getFieldType().equals("string")||alertFrom.getFieldType().equals("date")||alertFrom.getFieldType().equals("textarea")) {				
 				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), null,
-						new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.isBlock()));
+						new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getIsBlock()));
 				listfrom.add(vo);				
 			}else {
 				// 查询数据项				
@@ -52,7 +54,7 @@ public class AlertFormServiceImpl extends BaseService<AlertFromDto,AlertForm,Ale
 				 queryWrappercolumnMap.orderByAsc("sort_num");
 				Collection<DataDictionary> listDataDictionary = iDataDictionaryService.list(queryWrappercolumnMap);
 				AlertFormVo vo = new AlertFormVo(alertFrom.getFieldCode(), alertFrom.getFieldName(), alertFrom.getFieldType(), 
-				new Items(getdata(listDataDictionary)), new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.isBlock()));
+				new Items(getdata(listDataDictionary)), new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getIsBlock()));
 				listfrom.add(vo);				
 			}
 		}
@@ -69,4 +71,12 @@ public class AlertFormServiceImpl extends BaseService<AlertFromDto,AlertForm,Ale
 		}
 		return listAlertListvalue;
 	}
+
+	public List<String> queryListByFormId(String typeCode) {
+		return this.queryListByTypeCode(typeCode).stream().map(c -> c.getFieldCode()).collect(Collectors.toList());
+	}
+
+	private List<AlertFromDto> queryListByTypeCode(String alertTypeCode) {
+		return this.queryForList(null, false, alertTypeCode);
+	}
 }

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

@@ -4,7 +4,10 @@ package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 import com.yeejoin.amos.boot.module.jcs.api.dto.OrgUsrDto;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.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.mapper.OrgUsrMapper;
@@ -13,12 +16,15 @@ 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.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 java.lang.reflect.Method;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
@@ -36,6 +42,8 @@ import java.util.Map;
 public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMapper>  implements IOrgUsrService {
     @Autowired
     AlertFormValueServiceImpl alertFormValueServiceImpl;
+    @Autowired
+    AlertFormServiceImpl alertFormServiceImpl;
 
     @Override
     public String selectUpUnitByParam(String biz_org_code) {
@@ -244,6 +252,48 @@ public class OrgUsrServiceImpl extends  BaseService<OrgUsrDto,OrgUsr,OrgUsrMappe
         }
         return companyPersonMsg;
     }
+	public IPage<Map<String, Object>> pagePerson(String pageNum, String pageSize, OrgUsr orgUsr) {
+		IPage<Map<String, Object>> pageBean = null;
+		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<OrgUsr> orgUsrQueryWrapper = new QueryWrapper<>();
+		Class<? extends OrgUsr> aClass = orgUsr.getClass();
+		Arrays.stream(aClass.getDeclaredFields()).forEach(field -> {
+			try {
+				field.setAccessible(true);
+				Object o = field.get(orgUsr);
+				if (o != null) {
+					Class<?> type = field.getType();
+					String name = NameUtils.camel2Underline(field.getName());
+					if (type.equals(Integer.class)) {
+						Integer fileValue = (Integer) field.get(orgUsr);
+						orgUsrQueryWrapper.eq(name, fileValue);
+					} else if (type.equals(Long.class)) {
+						Long fileValue = (Long) field.get(orgUsr);
+						orgUsrQueryWrapper.eq(name, fileValue);
+					} else if (type.equals(String.class)) {
+						String fileValue = (String) field.get(orgUsr);
+						orgUsrQueryWrapper.eq(name, fileValue);
+					} else {
+						String fileValue = (String) field.get(orgUsr);
+						orgUsrQueryWrapper.eq(name, fileValue);
+					}
+				}
+			} catch (Exception e) {
+			}
+		});
+		pageBean.setTotal(this.baseMapper.selectCount(orgUsrQueryWrapper));
+		Map<String, Object> map = Bean.BeantoMap(orgUsr);
+		map.put("pageNum", (pageBean.getCurrent() -1) * pageBean.getSize());
+		map.put("pageSize", pageBean.getSize());
+		map.put("fields", alertFormServiceImpl.queryListByFormId("246"));
+		map.put("alertTypeCode", "246");
+		pageBean.setRecords(this.baseMapper.selectPersonList(map));
+		return pageBean;
+	}
 
     @Override
     public List<FormValue> getFormValue(QueryWrapper queryWrapper) throws Exception {