Merge remote-tracking branch 'origin/developer' into develop

amos-boot-jcs-system/src/main/resources/application-dev.properties

@@ -6,12 +6,15 @@ spring.datasource.password=root_123
 
 #eureka properties:
 eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
+eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url-path=/health
+eureka.instance.health-check-url-path=/actuator/health
+eureka.instance.lease-expiration-duration-in-seconds=10
+eureka.instance.lease-renewal-interval-in-seconds=5
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url-path=/info
+eureka.instance.status-page-url-path=/actuator/info
 eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
 
 

amos-boot-jcs-system/src/main/resources/application-qa.properties

@@ -5,9 +5,17 @@ spring.datasource.username=root
 spring.datasource.password=root_123
 
 #eureka properties:
-eureka.instance.hostname=172.16.10.72
+eureka.client.serviceUrl.defaultZone=http://172.16.10.72:10001/eureka/
+eureka.client.registry-fetch-interval-seconds=5
 eureka.instance.prefer-ip-address=true
-eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eureka/
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
+eureka.instance.health-check-url-path=/actuator/health
+eureka.instance.lease-expiration-duration-in-seconds=10
+eureka.instance.lease-renewal-interval-in-seconds=5
+eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
+eureka.instance.status-page-url-path=/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
 
 
 spring.redis.database=0

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

@@ -35,6 +35,9 @@ public class FirefightersDto extends BaseDto {
     @ApiModelProperty(value = "队伍id")
     private String fireTeamId;
 
+    @ApiModelProperty(value = "队伍名称")
+    private String fireTeamName;
+
     @ApiModelProperty(value = "姓名")
     private String name;
 
@@ -68,6 +71,9 @@ public class FirefightersDto extends BaseDto {
     @ApiModelProperty(value = "岗位名称")
     private String jobTitle;
 
+    @ApiModelProperty(value = "岗位code")
+    private String jobTitleCode;
+
     @ApiModelProperty(value = "人员状态，在职/离职")
     private String state;
 

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/FireTeamMapper.xml

@@ -14,8 +14,11 @@
         GROUP BY ft.sequence_nbr
     </select>
     <select id="queryFighterByTeamId" resultType="com.yeejoin.amos.boot.module.common.api.dto.FirefightersDto">
-        select *
-        from cb_firefighters
+        SELECT
+        ff.*,
+        (select name from cb_fire_team where sequence_nbr = ff.fire_team_id) fireTeamName
+        FROM
+        cb_firefighters ff
         where is_delete = 0
         and fire_team_id in
         <if test="teamIds != null">

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -124,8 +124,8 @@
                parent_id
         FROM `cb_org_usr`
         WHERE is_delete = 0
-            and biz_org_type = "COMPANY"
-           or biz_org_type = "DEPARTMENT"
+            and (biz_org_type = "COMPANY"
+           or biz_org_type = "DEPARTMENT")
     </select>
 
     <select id="queryOrgUsrListByBizOrgCode" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/DutyShiftController.java

@@ -108,7 +108,7 @@ public class DutyShiftController extends BaseController {
         Page<DutyShiftDto> page = new Page<>();
         page.setCurrent(current);
         page.setSize(size);
-        return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftPage(page, appKey));
+        return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftPage(page, appKey,false));
     }
 
     /**
@@ -121,6 +121,6 @@ public class DutyShiftController extends BaseController {
     @GetMapping(value = "/list")
     public ResponseModel<List<DutyShiftDto>> selectForList(HttpServletRequest request) {
         String appKey = request.getHeader("appKey");
-        return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList(appKey));
+        return ResponseHelper.buildResponse(dutyShiftServiceImpl.queryForDutyShiftList(appKey,false));
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyCommonServiceImpl.java

@@ -34,6 +34,7 @@ import java.util.stream.Collectors;
  * @author DELL
  */
 @Service
+@Transactional(rollbackFor = Exception.class)
 public class DutyCommonServiceImpl implements IDutyCommonService {
 
     @Autowired
@@ -285,7 +286,6 @@ public class DutyCommonServiceImpl implements IDutyCommonService {
         formInstance.setFieldValue(map.get(column.getFieldCode()) != null ? map.get(column.getFieldCode()).toString() : "");
     }
 
-    @Transactional(rollbackFor = Exception.class)
     @Override
     public Boolean deleteDutyData(Long instanceId) {
         dynamicFormInstanceService.remove(new LambdaQueryWrapper<DynamicFormInstance>().eq(DynamicFormInstance::getInstanceId, instanceId));

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DutyShiftServiceImpl.java

@@ -21,14 +21,14 @@ public class DutyShiftServiceImpl extends BaseService<DutyShiftDto, DutyShift, D
     /**
      * 分页查询
      */
-    public Page<DutyShiftDto> queryForDutyShiftPage(Page<DutyShiftDto> page, String appKey) {
-        return this.queryForPage(page, null, false, appKey);
+    public Page<DutyShiftDto> queryForDutyShiftPage(Page<DutyShiftDto> page, String appKey, Boolean isDelete) {
+        return this.queryForPage(page, null, false, appKey, isDelete);
     }
 
     /**
      * 列表查询 示例
      */
-    public List<DutyShiftDto> queryForDutyShiftList(String appKey) {
-        return this.queryForList("", false, appKey);
+    public List<DutyShiftDto> queryForDutyShiftList(String appKey, Boolean isDelete) {
+        return this.queryForList("", false, appKey, isDelete);
     }
 }

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

@@ -527,7 +527,7 @@ public class ExcelController extends BaseController {
 
     private String[] getDutyNameList() {
         List<String> dutyShiftList = new ArrayList<>();
-        List<DutyShiftDto> dutyShiftDtoList = dutyShiftService.queryForDutyShiftList(null);
+        List<DutyShiftDto> dutyShiftDtoList = dutyShiftService.queryForDutyShiftList(null,false);
         dutyShiftDtoList.forEach(item -> dutyShiftList.add(item.getName() + "@" + item.getSequenceNbr()));
         String[] dutyNameList = dutyShiftList.toArray(new String[dutyShiftList.size()]);
         return dutyNameList;