修改动态表单文件名错误

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

 package com.yeejoin.amos.boot.module.jcs.api.mapper;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormValueVo;
 
 /**
 *  Mapper 接口
@@ -11,4 +14,6 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 */
 public interface AlertFormValueMapper extends BaseMapper<AlertFormValue> {
 
+	public List<AlertFormValueVo> selectListByCalledId(Long id);
+
 }

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

@@ -44,4 +44,9 @@ public class AlertFormValueVo{
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 
+    @ApiModelProperty(value = "是否一行显示")
+    private Boolean isBlock;
+    
+    @ApiModelProperty(value = "表单类型")
+    private String fieldType;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertFromMapper.xml → amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertFormMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFromMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFormMapper">
 
 </mapper>

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertFromTypeMapper.xml → amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/resources/mapper/AlertFormTypeMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFromTypeMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFormTypeMapper">
 
 </mapper>

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFormValueMapper">
+	 <select id="selectListByCalledId" resultType="com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormValueVo">
+		SELECT
+			v.sequence_nbr sequenceNbr,
+			v.alert_form_id alertFormId,
+			v.alert_called_id alertCalledId,
+			v.alert_type_code alertTypeCode,
+			v.field_name fieldName,
+			v.field_code fieldCode,
+			v.field_value fieldValue,
+			v.field_value_code fieldValueCode,
+			v.rec_user_name recUserName,
+			v.rec_user_id recUserId,
+			v.rec_date recDate,
+			v.is_delete isDelete,
+			v.is_block isBlock,
+			f.field_type fieldType
+		FROM
+			jc_alert_form_value v
+		LEFT JOIN jc_alert_form f ON f.sequence_nbr = v.alert_form_id
+		WHERE v.alert_called_id=#{id}
+	</select>
+</mapper>

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

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFromValueMapper">
-
-</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

@@ -35,6 +35,7 @@ import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromValueDto;
 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.OrgPersonFormVo;
 import com.yeejoin.amos.boot.module.jcs.api.vo.OrgPersonVo;
@@ -159,15 +160,15 @@ public class OrgPersonController {
 		QueryWrapper queryWrapper = new QueryWrapper<>();
 		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) {
+		for (AlertFormValueVo alertFormValue : list) {
 			if (alertFormValue.getFieldValueCode() == null) {
-				FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text",
+				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",
+				FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), alertFormValue.getFieldType(),
 						alertFormValue.getFieldValueCode(), alertFormValue.getIsBlock());
 				formValue.add(value);
 			}
@@ -239,6 +240,7 @@ public class OrgPersonController {
 		} 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);
 	}

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

@@ -4,9 +4,11 @@ import com.yeejoin.amos.boot.module.jcs.api.dto.AlertFromValueDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.AlertFormValueMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IAlertFormValueService;
+import com.yeejoin.amos.boot.module.jcs.api.vo.AlertFormValueVo;
 
 import java.util.List;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -19,8 +21,15 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 @Service
 public class AlertFormValueServiceImpl extends  BaseService<AlertFromValueDto,AlertFormValue,AlertFormValueMapper>  implements IAlertFormValueService {
 
+	@Autowired
+	private AlertFormValueMapper alertFormValueMapper;
+	
 	public List<AlertFromValueDto> queryByCalledId(Long alertCalledId) {
 		return this.queryForList(null, false, alertCalledId);
 	}
 
+	public List<AlertFormValueVo> listByCalledId(Long id) {
+		return alertFormValueMapper.selectListByCalledId(id);
+	}
+
 }