Commit e76bb9ee authored by hkl's avatar hkl

feat:1.分析批次列表-详情-超限派工,派工状态查询无效

parent bd08fd78
...@@ -44,6 +44,9 @@ public class AnalysisBatchUnitDeviceDTO { ...@@ -44,6 +44,9 @@ public class AnalysisBatchUnitDeviceDTO {
@ApiModelProperty("设备编号") @ApiModelProperty("设备编号")
private String unitDeviceCode; private String unitDeviceCode;
@ApiModelProperty("派工状态")
private Integer workStatus;
@ApiModelProperty("得分平级") @ApiModelProperty("得分平级")
private List<String> gradeJudgeList; private List<String> gradeJudgeList;
......
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
t1.unit_score_level, t1.unit_score_level,
t1.unit_score_level_str, t1.unit_score_level_str,
t1.remark, t1.remark,
( SELECT COUNT( 1 ) FROM t_dsa_analysis_batch_unit_device_transfinite WHERE analysis_batch_unit_device_id = t1.id AND is_work = 1 LIMIT 1 ) AS is_work, ( SELECT IF(COUNT( 1 )>0,1,0) FROM t_dsa_analysis_batch_unit_device_transfinite WHERE analysis_batch_unit_device_id = t1.id AND is_work = 1 ) AS is_work,
( SELECT COUNT( 1 ) FROM t_dsa_analysis_batch_unit_device_transfinite WHERE analysis_batch_unit_device_id = t1.id LIMIT 1 ) AS is_transfinite, ( SELECT IF(COUNT( 1 )>0,1,0) FROM t_dsa_analysis_batch_unit_device_transfinite WHERE analysis_batch_unit_device_id = t1.id ) AS is_transfinite,
( SELECT COUNT( 1 ) FROM t_mw_work_batch_detail WHERE analysis_batch_unit_device_id = t1.id LIMIT 1 ) AS work_status ( SELECT IF(COUNT( 1 )>0,1,0) FROM t_mw_work_batch_detail WHERE analysis_batch_unit_device_id = t1.id LIMIT 1 ) AS work_status
FROM FROM
t_dsa_analysis_batch_unit_device t1 t_dsa_analysis_batch_unit_device t1
WHERE WHERE
...@@ -69,6 +69,12 @@ ...@@ -69,6 +69,12 @@
<if test="dto.unitDeviceCode != null and dto.unitDeviceCode != ''"> <if test="dto.unitDeviceCode != null and dto.unitDeviceCode != ''">
AND analysis.unit_device_code like concat('%',#{dto.unitDeviceCode},'%') AND analysis.unit_device_code like concat('%',#{dto.unitDeviceCode},'%')
</if> </if>
<if test="dto.unitDeviceCode != null and dto.unitDeviceCode != ''">
AND analysis.unit_device_code like concat('%',#{dto.unitDeviceCode},'%')
</if>
<if test="dto.workStatus != null ">
AND analysis.work_status = #{dto.workStatus}
</if>
order by unit_starting_mileage order by unit_starting_mileage
</select> </select>
<select id="getUnitDeviceStaticData" resultType="org.jeecg.modules.unitDevice.vo.StaticCheckVO"> <select id="getUnitDeviceStaticData" resultType="org.jeecg.modules.unitDevice.vo.StaticCheckVO">
......
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