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/dto/AlertFromValueDto.java

@@ -19,7 +19,7 @@ public class AlertFromValueDto extends BaseDto {
 
 
     @ApiModelProperty(value = "表单id")
-    private Integer alertFromId;
+    private Long alertFormId;
 
     @ApiModelProperty(value = "警情id")
     private Long alertCalledId;
@@ -42,4 +42,7 @@ public class AlertFromValueDto extends BaseDto {
     @ApiModelProperty(value = "操作人名称")
     private String recUserName;
 
+    private Boolean isBlock;
+    
+    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/entity/AlertFormValue.java

@@ -49,7 +49,7 @@ public class AlertFormValue extends BaseEntity {
     private String recUserName;
 
     @ApiModelProperty(value = "是否一行显示")
-    private boolean isBlock;
+    private Boolean isBlock;
 
 	public AlertFormValue() {
 		super();

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

 package com.yeejoin.amos.boot.module.jcs.api.vo;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -18,7 +20,7 @@ import java.util.List;
 @Accessors(chain = true)
 @TableName("cb_org_usr")
 @ApiModel(value="OrgUsrVo", description="人员信息")
-public class OrgPersonFormVo {
+public class OrgPersonFormVo extends BaseEntity{
 
     private static final long serialVersionUID = 1L;
 

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

@@ -138,7 +138,7 @@ public class AlertCalledController extends BaseController {
              List<FormValue> formValue = new ArrayList<FormValue>();
              if(list!=null&&list.size()>0) {
 	        	 for (AlertFormValue alertFormValue : list) {
-	                 FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.isBlock());
+	                 FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValue(),alertFormValue.getIsBlock());
 	                 formValue.add(value);
 	             }
              }

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

@@ -143,10 +143,10 @@ public class OrgDepartmentController {
         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.isBlock());
+                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.isBlock());
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValueCode(), alertFormValue.getIsBlock());
                 formValue.add(value);
             }
         }

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

@@ -146,10 +146,10 @@ public class OrgUsrController extends BaseController {
         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.isBlock());
+                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.isBlock());
+                FormValue value = new FormValue(alertFormValue.getFieldCode(), alertFormValue.getFieldName(), "text", alertFormValue.getFieldValueCode(), alertFormValue.getIsBlock());
                 formValue.add(value);
             }
         }

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,6 +4,9 @@ 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 java.util.List;
+
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 
@@ -16,4 +19,8 @@ import org.typroject.tyboot.core.rdbms.service.BaseService;
 @Service
 public class AlertFormValueServiceImpl extends  BaseService<AlertFromValueDto,AlertFormValue,AlertFormValueMapper>  implements IAlertFormValueService {
 
+	public List<AlertFromValueDto> queryByCalledId(Long alertCalledId) {
+		return this.queryForList(null, false, alertCalledId);
+	}
+
 }