修改bug

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

@@ -99,14 +99,11 @@
                     <when test="fieldCodes[key] == 'eq' and value !=null and value !=''">
                         and d.${key} = #{value}
                     </when>
-                    <when test="fieldCodes[key] == 'ge' and value !=null and value !=''">
-                        and d.${key} >= #{value}
-                    </when>
-                    <when test="fieldCodes[key] == 'le' and value !=null and value !=''">
-                        and d.${key} <![CDATA[<=]]> #{value}
-                    </when>
                 </choose>
             </foreach>
+        <if test="params.endDate != null and params.beginDate != null">
+            and d.endDate between #{params.beginDate} and #{params.endDate}
+        </if>
         </if>
         <if test="params.date != null and params.lift == 'descend'">
         order by endDate desc

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

@@ -12,6 +12,12 @@
     a.name,
     a.latitude,
     a.person_charge_telephone personChargeTelephone,
+     (SELECT count(i.instance_id)
+        from
+        cb_dynamic_form_instance i
+        where
+        i.field_value = a.sequence_nbr ) As userNum,
+    (SELECT COUNT(*)FROM jc_firestation_jacket WHERE firefighters_id = a.sequence_nbr and is_delete =0) AS eqNum,
     Round(st_distance(point(a.longitude,a.latitude),point(#{par.longitude},#{par.latitude}))*111195,1) AS distance
     FROM cb_fire_station a
     where  a.is_delete=0 and a.longitude is not null and a.latitude   is not null

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/dto/PowerTransferCompanyResourcesDto.java

@@ -38,4 +38,6 @@ public class PowerTransferCompanyResourcesDto extends BaseDto {
     @ApiModelProperty(value = "调派关联部门id")
     protected Long  powerTransferCompanyId;
 
+    @ApiModelProperty(value = "任务状态")
+    protected String  status;
 }

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

@@ -44,8 +44,26 @@
     </select>
 
     <select id="getPowerTransferInfoCount" resultType="java.util.Map">
-        select count(distinct pt.sequence_nbr) transfer_count, count(distinct ptcr.sequence_nbr) car_count, 0 end_count,
-        0
+        select count(distinct pt.sequence_nbr) transfer_count, count(distinct ptcr.sequence_nbr) car_count,
+        (select count(status) from jc_power_transfer_company_resources  where  is_delete = 0 AND status = 'finished'
+            <if test="beginDate != null and beginDate != ''">
+                AND rec_date &gt;= #{beginDate}
+            </if>
+
+            <if test="endDate != null and endDate != ''">
+                AND rec_date &lt;= #{endDate}
+            </if>
+         )
+        end_count,
+        (select count(car_status) from jc_power_transfer_company_resources  where  is_delete = 0 AND status = 'executing'
+            <if test="beginDate != null and beginDate != ''">
+                AND rec_date &gt;= #{beginDate}
+            </if>
+
+            <if test="endDate != null and endDate != ''">
+                AND rec_date &lt;= #{endDate}
+            </if>
+         )
         no_return_car_count
         from jc_power_transfer pt
         left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
@@ -61,6 +79,7 @@
         </where>
         order by pt.rec_date asc
     </select>
+
     <select id="getPowerTransferInfo" resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferDto">
         select sequence_nbr, rescue_grid
         from jc_power_transfer pt
@@ -93,7 +112,7 @@
     </select>
     <select id="getPowerTransferCompanyResourcesInfo"
             resultType="com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto">
-        select ptcr.power_transfer_company_id, ptcr.type, ptcr.resources_num, ptcr.resources_id
+        select ptcr.power_transfer_company_id, ptcr.type, ptcr.resources_num, ptcr.resources_id,ptcr.status
         from jc_power_transfer pt
         left join jc_power_transfer_company ptc on pt.sequence_nbr = ptc.power_transfer_id
         left join jc_power_transfer_company_resources ptcr on ptc.sequence_nbr = ptcr.power_transfer_company_id

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

@@ -411,6 +411,7 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                         powerTransferCompanyResourcesInfo.forEach(ptcr -> {
                             if (powerTransferCompanyId.equals(ptcr.getPowerTransferCompanyId())) {
                                 transferDetail.append(ptcr.getResourcesNum()).append("、");
+                                transferDetail.append(ptcr.getStatus()).append("、");
                             }
                         });
                         transferDetail.deleteCharAt(transferDetail.length() - 1);
@@ -419,11 +420,24 @@ public class PowerTransferServiceImpl extends BaseService<PowerTransferDto, Powe
                 }
             });
             transferDetail.deleteCharAt(transferDetail.length() - 1);
-            String transferDetails = templateContent.replace("departmentName-type-resourcesNum",
-                    transferDetail.toString()).replace("rescueGrid", rescueGrid == null ? "" : rescueGrid).replace(
-                    "taskStatus", "");
-
-            transferContent.add(transferDetails);
+            if (transferDetail.toString().contains("、")){
+                String transfer = null ;
+                String taskStatus = null ;
+                String[] split = transferDetail.toString().split("、");
+                if (split.length > 1 ){
+                    transfer = split[0];
+                    taskStatus = split[1];
+                }
+                String transferDetails = templateContent.replace("departmentName-type-resourcesNum",
+                        transfer).replace("rescueGrid", rescueGrid == null ? "" : rescueGrid).replace(
+                        "taskStatus",taskStatus!=null?FireCarStatusEnum.getEnum(taskStatus).getName():null);
+                transferContent.add(transferDetails);
+            }else {
+                String transferDetails = templateContent.replace("departmentName-type-resourcesNum",
+                        transferDetail.toString()).replace("rescueGrid", rescueGrid == null ? "" : rescueGrid).replace(
+                        "taskStatus", "");
+                transferContent.add(transferDetails);
+            }
         });
         transferInfo.put("transferContent", transferContent);