Your ROOT_URL in app.ini is http://git.zky.com/ but you are visiting http://61.178.84.89:8998/luoluo/ry_zhky/commit/08be98b4470b8e2f0388e48981d258a6571cc002?style=unified&whitespace=ignore-all You should set ROOT_URL correctly, otherwise the web may not work correctly.
luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:密品设备维修提交

Browse Source
pg_adapter
wangxy 8 months ago
parent c3ab1cd781
commit 08be98b447
5 changed files with 6 additions and 5 deletions

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/CheckReportManager.java
Unescape View File

@ -58,7 +58,7 @@ public class CheckReportManager {
.remove();
} else {
if(Objects.isNull(tdCheckReport.getCheckState())){
tdCheckReport.setCheckState("2");
tdCheckReport.setCheckState("3");
}
tdCheckReport.setDepart(ShiroUtils.getSysUser().getDept().getDeptName());
tdCheckReport.setAdduser(ShiroUtils.getSysUser().getUserName());

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/check/CheckReportController.java
Unescape View File

@ -173,6 +173,7 @@ public class CheckReportController extends BaseController {
@PostMapping("/selfCheckSave")
@ResponseBody
public AjaxResult selfCheckSave(@RequestBody TdCheckReportDTO checkReportDTO) {
checkReportDTO.setCheckState("2");
return toAjax(checkReportManager.saveOrUpdate(checkReportDTO));
}

2
ruoyi-admin/src/main/resources/templates/system/checkReport/checkReport.html
Unescape View File

@ -142,7 +142,7 @@
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>详情</a> ');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="openEdit(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-success btn-xs ' + selfCheckFlag + '" href="javascript:void(0)" onclick="selfcheck(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>自查</a> ');
actions.push('<a class="btn btn-success btn-xs ' + selfCheckFlag + '" href="javascript:void(0)" onclick="selfcheck(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>初检</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.checkId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}

2
ruoyi-admin/src/main/resources/templates/system/checkresult/checkresult.html
Unescape View File

@ -138,7 +138,7 @@
formatter: function(value, row, index) {
var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + downloadFlag + '" href="javascript:void(0)" onclick="checkResultPrint(\'' + row.checkId + '\')"><i class="fa fa-download"></i>打印</a> ');
actions.push('<a class="btn btn-success btn-xs ' + checkresultFlag + '" href="javascript:void(0)" onclick="resultCheck(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>检查</a> ');
actions.push('<a class="btn btn-success btn-xs ' + checkresultFlag + '" href="javascript:void(0)" onclick="resultCheck(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>保密检查</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.checkId + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join('');
}

4
ruoyi-system/src/main/resources/mapper/system/TdCheckReportMapper.xml
Unescape View File

@ -39,7 +39,7 @@
<if test="depart!=null and depart!=''">
AND depart = #{depart}
</if>
AND (check_type = '0' or check_type is null)
AND check_state = '3'
</trim>
ORDER BY create_time DESC
</select>
@ -59,7 +59,7 @@
<if test="depart!=null and depart!=''">
AND depart = #{depart}
</if>
AND check_type in (0,1)
AND check_state != '3'
</trim>
ORDER BY create_time DESC
</select>

Write Preview
Loading…
Cancel
Save