优化

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgPersonDto.java

@@ -22,7 +22,6 @@ import lombok.EqualsAndHashCode;
 @ApiModel(value="OrgUsr对象", description="人员信息")
 public class OrgPersonDto extends BaseDto {
 
-
     /**
 	 * 
 	 */
@@ -82,4 +81,6 @@ public class OrgPersonDto extends BaseDto {
     @ApiModelProperty(value = "动态表单值")
     private List<DynamicFormInstance> dynamicFormValue;
 
+    private String personImg;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrDto.java

@@ -99,4 +99,6 @@ public class OrgUsrDto extends BaseDto {
 
     @ApiModelProperty(value = "消防信息实体")
     private CompanyInfo companyInfo;
+
+    private String personImg;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/OrgUsr.java

@@ -90,4 +90,7 @@ public class OrgUsr extends BaseEntity {
     @ApiModelProperty(value = "管理类别")
     @TableField(exist = false)
     private String managementType;
+
+    @ApiModelProperty(value = "人员照片")
+    private String personImg;
 }

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

@@ -20,9 +20,32 @@
         SELECT
             (
                 SELECT
-                    Ifnull  (GROUP_CONCAT( cou.biz_org_name ),'') AS
-                value
-
+                    Ifnull  (GROUP_CONCAT( cou.biz_org_name ),'') AS value
+        FROM
+            (
+            SELECT
+            cdfi.field_value AS userId
+            FROM
+            cb_dynamic_form_instance cdfi
+            WHERE
+            cdfi.instance_id IN (
+            SELECT
+            cdps.instance_id
+            FROM
+            cb_duty_person_shift cdps
+            LEFT JOIN cb_dynamic_form_instance cdfi ON cdps.instance_id = cdfi.instance_id
+            WHERE
+            cdfi.field_code = 'postType'
+            AND field_value = '1676'
+            AND cdps.duty_date = ( SELECT DATE_FORMAT(NOW(),"%Y-%m-%d"))
+            )
+            AND cdfi.field_code = 'userId'
+            ) temp
+            LEFT JOIN cb_org_usr cou ON cou.sequence_nbr = temp.userId WHERE cou.is_delete = 0
+            ) AS value,
+                                                                           (
+        SELECT
+            Ifnull(GROUP_CONCAT( dfi.field_value ),'') AS tel
         FROM
             (
             SELECT
@@ -43,11 +66,8 @@
             )
             AND cdfi.field_code = 'userId'
             ) temp
-            LEFT JOIN cb_org_usr cou ON cou.sequence_nbr = temp.userId
-        WHERE cou.is_delete = 0
-            ) AS
-            value
-            ,
+            LEFT JOIN cb_dynamic_form_instance dfi ON dfi.instance_id = temp.userId WHERE dfi.field_code = 'telephone'
+            ) AS tel,
             '当值值长' AS name
     </select>
     <select id="getOrganizationList" resultType="java.util.Map">

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

@@ -778,9 +778,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	public String getPersonImg(String id) {
 		Long userId = Long.valueOf(id);
 		OrgUsr orgUsr = this.baseMapper.queryByUserId(userId);
-		List<DynamicFormInstanceDto> list = alertFormValueServiceImpl.listBySeqnum(orgUsr.getSequenceNbr());
-		String str = list.get(0).getFieldValue();
-		return str;
+		return orgUsr.getPersonImg();
 	}
 
 	public List<FormValue> getFormValueDetail(Long id) throws Exception {
@@ -2964,6 +2962,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		orgUsr.setBizOrgName(peopleBasicInfoDto.getName());
 		orgUsr.setParentId(peopleBasicInfoDto.getCompany());
 		orgUsr.setParentName(peopleBasicInfoDto.getBizOrgName());
+		orgUsr.setPersonImg(peopleBasicInfoDto.getPersonImg());
 		orgUsr.setIsDelete(false);
 		return orgUsr;
 	}

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

@@ -5,6 +5,7 @@ import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 
 import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.common.api.entity.*;
 import com.yeejoin.amos.boot.module.common.api.enums.ExceptionEnum;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -50,14 +51,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.FirefightersZhDto;
 import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
 import com.yeejoin.amos.boot.module.common.api.dto.PeopleBasicInfoDto;
 import com.yeejoin.amos.boot.module.common.api.dto.PeopleInfoDto;
-import com.yeejoin.amos.boot.module.common.api.entity.FireTeam;
-import com.yeejoin.amos.boot.module.common.api.entity.Firefighters;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContacts;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersContract;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersEducation;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersJacket;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersPost;
-import com.yeejoin.amos.boot.module.common.api.entity.FirefightersThought;
 import com.yeejoin.amos.boot.module.common.api.enums.OrgPersonEnum;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FireTeamServiceImpl;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FirefightersContactsServiceImpl;

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

@@ -47,29 +47,13 @@ public class OrganizationImpl extends BaseService<Organization, Organization, Or
             // 获取值长
             Map<String, Object> resMap = this.baseMapper.getTeamLeader();
             Map<String, Object> leaderMap = new HashMap<>();
-            resMap.put("name", "当值值长");
-            resMap.put("value", "aaa");
             if (ObjectUtils.isEmpty(resMap.get("value"))) {
                 leaderMap.put("name", resMap.get("name") + "");
                 leaderMap.put("value", "");
             } else {
-                List<Organization> collect = organizations.stream().filter(x -> x.getEmergencyTeamName().equals(resMap.get("name"))).collect(Collectors.toList());
-                if (0 < collect.size()) {
-                    Organization organizationEntity = collect.get(0);
-                    String[] nameArr = organizationEntity.getGroupLeader().split(",");
-                    List<String> nameList = Arrays.asList(nameArr);
-                    String[] telArr = new String[nameList.size()];
-                    if (ObjectUtils.isNotEmpty(organizationEntity.getGroupLeaderTel())) {
-                        telArr = organizationEntity.getGroupLeaderTel().split("\n");
-                    }
-                    List<String> telList = Arrays.asList(telArr);
-                    List<String> valueList = new ArrayList<>();
-                    for (int i = 0; i < nameList.size(); i++) {
-                        valueList.add(nameList.get(i) + "-" + telList.get(i));
-                    }
-                    leaderMap.put("name", resMap.get("name") + "");
-                    leaderMap.put("value", String.join(",", valueList));
-                }
+                // 跟现场确认此处值长只有一人，所以只做一人处理
+                leaderMap.put("name", resMap.get("name") + " " + "1人");
+                leaderMap.put("value", resMap.get("value") + "-" + resMap.get("tel"));
             }
             res.add(leaderMap);
 

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3882,4 +3882,16 @@
         </sql>
     </changeSet>
 
+    <changeSet author="ky" id="2023-06-21-001">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_org_usr" columnName="person_img"/>
+            </not>
+        </preConditions>
+        <comment>cb_org_usr add column</comment>
+        <sql>
+            alter table `cb_org_usr` add column `person_img` varchar(255) DEFAULT NULL COMMENT '人员照片'
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>