Skip to content

A
amos-boot-biz
Commit 3946a86d authored by tangwei's avatar tangwei
Browse files
Options

修改bug

parent 489e474d
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 0 deletions
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrFormDto.java
View file @ 3946a86d
...@@ -84,6 +84,13 @@ public class OrgUsrFormDto implements Serializable { ...@@ -84,6 +84,13 @@ public class OrgUsrFormDto implements Serializable {
private String code; private String code;
@ApiModelProperty(value = "消防管理人")
private String xfgl;
@ApiModelProperty(value = "单位负责人")
private String dwfz;
@ApiModelProperty(value = "消防安全负责人")
private String xfaq;
public void setDynamicFormAlert(List<FormValue> dynamicFormAlert) { public void setDynamicFormAlert(List<FormValue> dynamicFormAlert) {
if(dynamicFormAlert!=null) { if(dynamicFormAlert!=null) {
dynamicFormAlert.forEach(formValue->{ dynamicFormAlert.forEach(formValue->{
......
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java
View file @ 3946a86d
...@@ -107,5 +107,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> { ...@@ -107,5 +107,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
@DataAuth(interfacePath="") @DataAuth(interfacePath="")
List<OrgUsr> companyDeptListWithPersonCount(Map<String, Object> param); List<OrgUsr> companyDeptListWithPersonCount(Map<String, Object> param);
Map<String,String> selectPersonone(@Param("name")String name ,@Param("id")Long id);
List<OrgUsr> listByOrgTypes(@Param("orgTypeList") List<String> orgTypeList,@Param("bizOrgCode") String bizOrgCode); List<OrgUsr> listByOrgTypes(@Param("orgTypeList") List<String> orgTypeList,@Param("bizOrgCode") String bizOrgCode);
} }
amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/resources/mapper/UnitPersonMapper.xml
View file @ 3946a86d
...@@ -164,7 +164,13 @@ ...@@ -164,7 +164,13 @@
</select> </select>
<select id="selectPersonone" resultType="Map">
select group_concat( CONCAT( u.biz_org_name,' ',(select c.field_value from cb_dynamic_form_instance c where field_code='telephone' and c.instance_id=u.sequence_nbr))) name
from cb_org_usr u LEFT JOIN
cb_dynamic_form_instance g on g.instance_id=u.sequence_nbr
where u.biz_org_type='PERSON' and g.field_code='fireManagementPostCode' and g.field_value_label =#{name} and u.parent_id=#{id}
</select>
</mapper> </mapper>
amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java
View file @ 3946a86d
...@@ -31,6 +31,7 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult; ...@@ -31,6 +31,7 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege; import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel; import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel; import com.yeejoin.amos.feign.privilege.model.RoleModel;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -839,6 +840,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -839,6 +840,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
@Override @Override
public OrgUsrFormDto selectCompanyById(Long id) throws Exception { public OrgUsrFormDto selectCompanyById(Long id) throws Exception {
OrgUsr orgUsr = getById(id); OrgUsr orgUsr = getById(id);
// 动态表单数据 // 动态表单数据
List<FormValue> formValue = getFormValue(id); List<FormValue> formValue = getFormValue(id);
// bug 2580 返回值改为具体名称 chenzhao 2021-09-27 start // bug 2580 返回值改为具体名称 chenzhao 2021-09-27 start
...@@ -852,6 +856,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -852,6 +856,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
OrgUsrFormDto orgUsrFormVo = new OrgUsrFormDto(); OrgUsrFormDto orgUsrFormVo = new OrgUsrFormDto();
orgUsrFormVo.setDynamicFormAlert(formValue); orgUsrFormVo.setDynamicFormAlert(formValue);
BeanUtils.copyProperties(orgUsr, orgUsrFormVo); BeanUtils.copyProperties(orgUsr, orgUsrFormVo);
Map<String,String> Xfaq=orgUsrMapper.selectPersonone("消防安全负责人",id);
Map<String,String> Xfgl=orgUsrMapper.selectPersonone("消防安全管理人",id);
Map<String,String> Dwfz= orgUsrMapper.selectPersonone("法定代表人",id);
orgUsrFormVo.setXfaq(Xfaq!=null?Xfaq.get("name"):"");
orgUsrFormVo.setXfgl(Xfgl!=null?Xfgl.get("name"):"");
orgUsrFormVo.setDwfz(Dwfz!=null?Dwfz.get("name"):"");
return orgUsrFormVo; return orgUsrFormVo;
} }
......
amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml
View file @ 3946a86d
...@@ -2661,5 +2661,40 @@ ...@@ -2661,5 +2661,40 @@
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="tw" id="2022-0119">
<preConditions onFail="MARK_RAN">
<tableExists tableName="cb_dynamic_form_column"/>
</preConditions>
<comment>cb_dynamic_form_column 字段删除</comment>
<sql>
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (7, 'businessCategory', '经营类别', 'select', 7, 'eq', b'0', b'0', '244', '{\"url\": \"\", \"data\": [], \"dict\": \"GLLB\", \"type\": \"dict\"}', NULL, NULL, '2021-07-07 10:58:11', b'0', NULL, 5, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (9, 'companyLocation', '单位地址', 'inputPoi', 7, 'like', b'0', b'0', '244', '{\"url\": \"/fire-fighting-system/mapsdk\", \"type\": \"url\"}', NULL, NULL, '2021-12-29 07:14:04', b'0', NULL, 2, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (10, 'companyPhone', '单位电话', 'input', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2021-07-07 02:59:34', b'0', NULL, 3, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (11, 'companyMaleEmployees', '男员工人数', 'inputNumber', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2021-07-12 03:06:11', b'0', NULL, 7, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (12, 'companyFemaleEmployees', '女员工人数', 'inputNumber', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2021-07-12 03:06:13', b'0', NULL, 8, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (13, 'companyPhoto', '单位照片', 'upload', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2021-07-07 02:59:31', b'0', NULL, 1, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (14, 'coordinate', '标注/标绘坐标数组', 'inputBitmap', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2021-08-19 09:13:14', b'1', NULL, 2, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (15, 'managementType', '管理类别', 'select', 7, 'eq', b'0', b'0', '244', '{\"url\": \"\", \"data\": [], \"dict\": \"GLLB\", \"type\": \"dict\"}', NULL, NULL, '2021-07-07 10:58:59', b'0', NULL, 1, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (16, 'companyNature', '单位性质', 'select', 7, 'eq', b'0', b'0', '244', '{\"url\": \"\", \"data\": [], \"dict\": \"DWXZ\", \"type\": \"dict\"}', NULL, NULL, '2021-07-07 10:58:44', b'0', NULL, 4, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812065, 'longitude', '经度', 'input', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2021-08-19 09:13:17', b'0', NULL, 9, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812066, 'latitude', '纬度', 'input', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2021-08-19 09:13:19', b'0', NULL, 10, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812089, 'useType', '用途类型', 'select', 7, 'eq', b'0', b'0', '244', '{\"url\": \"\", \"data\": [], \"dict\": \"USE_TYPE\", \"type\": \"dict\"}', NULL, NULL, '2022-01-19 07:38:11', b'1', NULL, 11, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812090, 'eleType', '站点类型', 'select', 7, 'eq', b'0', b'0', '244', '{\"url\": \"\", \"data\": [], \"dict\": \"ELE_TYPE\", \"type\": \"dict\"}', NULL, NULL, '2022-01-19 07:38:11', b'1', NULL, 12, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812092, 'orgChargePerson', '单位负责人', 'input', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2022-01-19 07:38:11', b'1', NULL, 13, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812093, 'orgChargePersonPhone', '单位负责人电话', 'input', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2022-01-19 07:38:11', b'1', NULL, 14, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812094, 'safetyChargePerson', '安全负责人', 'input', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2022-01-19 07:38:11', b'1', NULL, 15, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812095, 'safetyChargePersonPhone', '安全负责人电话', 'input', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2022-01-19 07:38:11', b'1', NULL, 16, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812096, 'safetyManager', '安全管理人', 'input', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2022-01-19 07:38:11', b'1', NULL, 17, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812097, 'safetyManagerPhone', '安全管理人电话', 'input', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2022-01-19 07:38:11', b'1', NULL, 18, NULL);
REPLACE INTO `xiy_amos_jcs_biz`.`cb_dynamic_form_column`(`sequence_nbr`, `field_code`, `field_name`, `field_type`, `group_id`, `query_strategy`, `not_null`, `block`, `group_code`, `column_config`, `rec_user_name`, `rec_user_id`, `rec_date`, `is_delete`, `remark`, `sort`, `org_code`) VALUES (132828674812099, 'companyPlanePhonto', '单位总平面图', 'upload', 7, 'eq', b'0', b'0', '244', NULL, NULL, NULL, '2022-01-19 07:38:11', b'1', NULL, 20, NULL);
</sql>
</changeSet>
</databaseChangeLog> </databaseChangeLog>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment