Merge branch 'gdd' into developer

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

@@ -61,4 +61,12 @@ public class AlertFormValue extends BaseEntity {
         this.fieldCode = fieldCode;
         this.isBlock = isBlock;
     }
+    
+    public AlertFormValue(Long alertFormId, String fieldName, String fieldCode, boolean isBlock, String alertTypeCode) {
+        this.alertFormId = alertFormId;
+        this.fieldName = fieldName;
+        this.fieldCode = fieldCode;
+        this.isBlock = isBlock;
+        this.alertTypeCode = 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/AlertFormServiceImpl.java

@@ -45,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.getBlock()));
+						new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getBlock(), alertFrom.getAlertTypeCode()));
 				listfrom.add(vo);				
 			}else {
 				// 查询数据项				
@@ -54,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.getBlock()));
+				new Items(getdata(listDataDictionary)), new AlertFormValue(alertFrom.getSequenceNbr(),alertFrom.getFieldName(), alertFrom.getFieldCode(),alertFrom.getBlock(), alertFrom.getAlertTypeCode()));
 				listfrom.add(vo);				
 			}
 		}

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

@@ -23,6 +23,9 @@ 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 com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
+
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.utils.Bean;
@@ -381,6 +384,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                     dis.setRecDate(new Date());
                     dis.setRecUserId(orgUsr.getRecUserId());
                     dis.setRecUserName(orgUsr.getRecUserName());
+                    dis.setAlertTypeCode(src.getAlertTypeCode());
                     break;
                 }
             }
@@ -427,6 +431,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         BeanUtils.copyProperties(OrgPersonVo, orgUsr);
         orgUsr.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_PERSON);
+        AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
+        OrgPersonVo.setAmosOrgCode(user.getRealName());
         saveOrgUsrAlertFormValue(orgUsr, OrgPersonVo.getAlertFormValue());
     }
 
@@ -447,6 +453,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         OrgUsr orgUsr = new OrgUsr();
         OrgUsr oriOrgUsr = getById(id);
         BeanUtils.copyProperties(OrgPersonVo, orgUsr);
+        AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
+        oriOrgUsr.setAmosOrgCode(user.getRealName());
+        orgUsr.setAmosOrgCode(user.getRealName());
         saveOrgUsr(oriOrgUsr, id);
         // 保存动态表单数据
         updateAlertFormValue(oriOrgUsr, orgUsr.getSequenceNbr(), OrgPersonVo.getAlertFormValue());