bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-09-12 09:53:03 +08:00
parent 9ee0268138 3a1d073a68
commit 3135a41ec2
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
View File

@ -271,6 +271,6 @@ public class TmTask implements Serializable {
private int souceBy; private int souceBy;
/**0:update_time ASC 1:update_time DESC 2:task_status ASC 3:task_status DESC*/ /**0:update_time ASC 1:update_time DESC 2:task_status ASC 3:task_status DESC*/
private int orderStatus; private Integer orderStatus;
} }

8
sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -534,11 +534,11 @@
GROUP BY tt.task_id GROUP BY tt.task_id
order by order by
case when #{record.orderStatus} = 0 then tt.update_time case when #{record.orderStatus} = 0 then tt.update_time
when #{record.orderStatus} = 1 then tt.update_time when #{record.orderStatus} = 1 or #{record.orderStatus} is null then tt.update_time
when #{record.orderStatus} = 2 then tt.task_status when #{record.orderStatus} = 2 then tt.task_status
when #{record.orderStatus} = 3 then tt.task_status when #{record.orderStatus} = 3 then tt.task_status
end end
<if test="record.orderStatus == 1 or record.orderStatus == 3"> <if test="record.orderStatus == 1 or record.orderStatus == 3 or record.orderStatus == null">
desc desc
</if> </if>
</select> </select>
@ -1033,11 +1033,11 @@
GROUP BY tt.task_id GROUP BY tt.task_id
order by order by
case when #{record.orderStatus} = 0 then tt.update_time case when #{record.orderStatus} = 0 then tt.update_time
when #{record.orderStatus} = 1 then tt.update_time when #{record.orderStatus} = 1 or #{record.orderStatus} is null then tt.update_time
when #{record.orderStatus} = 2 then tt.task_status when #{record.orderStatus} = 2 then tt.task_status
when #{record.orderStatus} = 3 then tt.task_status when #{record.orderStatus} = 3 then tt.task_status
end end
<if test="record.orderStatus == 1 or record.orderStatus == 3"> <if test="record.orderStatus == 1 or record.orderStatus == 3 or record.orderStatus == null">
desc desc
</if> </if>
</select> </select>

4
sgzb-ui/src/views/base/comeAndGo/index.vue
View File

@ -450,7 +450,7 @@ export default {
this.isLoading = true this.isLoading = true
if (this.form.unitId != undefined) { if (this.form.unitId != undefined) {
console.log(this.form) console.log(this.form)
/*updateUnit(this.form) updateUnit(this.form)
.then((response) => { .then((response) => {
this.$modal.msgSuccess('修改成功') this.$modal.msgSuccess('修改成功')
this.open = false this.open = false
@ -459,7 +459,7 @@ export default {
}) })
.catch(() => { .catch(() => {
this.isLoading = false this.isLoading = false
})*/ })
} else { } else {
console.log(this.form) console.log(this.form)
addUnit(this.form) addUnit(this.form)