diff --git a/src/main/java/com/cm/inspection/controller/apis/check/Check2Controller.java b/src/main/java/com/cm/inspection/controller/apis/check/Check2Controller.java index 6952ef6..5e64280 100644 --- a/src/main/java/com/cm/inspection/controller/apis/check/Check2Controller.java +++ b/src/main/java/com/cm/inspection/controller/apis/check/Check2Controller.java @@ -19,6 +19,7 @@ import com.cm.inspection.pojo.vos.check.CheckCompleteVO; import com.cm.inspection.pojo.vos.check.StreetToLeaderVO; import com.cm.inspection.service.check.ICheck2Service; import io.swagger.annotations.*; +import org.activiti.engine.history.HistoricTaskInstance; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -224,4 +225,9 @@ public class Check2Controller extends AbstractController { return check2Service.listPageCityOfMine(page); } + @GetMapping("list-historic-task/{checkId}") + public List listHistoricTask(@PathVariable("checkId") String checkId) { + return check2Service.listHistoricTask(checkId); + } + } \ No newline at end of file diff --git a/src/main/java/com/cm/inspection/enums/CheckProcessParamsEnum.java b/src/main/java/com/cm/inspection/enums/CheckProcessParamsEnum.java index 844b937..d636510 100644 --- a/src/main/java/com/cm/inspection/enums/CheckProcessParamsEnum.java +++ b/src/main/java/com/cm/inspection/enums/CheckProcessParamsEnum.java @@ -16,7 +16,8 @@ public enum CheckProcessParamsEnum { IS_RE_REPORT("isReReport", "是否复查"), LAST_CHECK_ID("lastCheckId", "最后的检查ID"), HANDLE_TYPE("handleType", "处理类型"), - LEADER("leader", "领导"); + LEADER("leader", "领导"), + HANDLER("handler", "处理人"); private String value; private String summary; diff --git a/src/main/java/com/cm/inspection/service/check/ICheck2Service.java b/src/main/java/com/cm/inspection/service/check/ICheck2Service.java index 4dbb747..812f1eb 100644 --- a/src/main/java/com/cm/inspection/service/check/ICheck2Service.java +++ b/src/main/java/com/cm/inspection/service/check/ICheck2Service.java @@ -8,6 +8,7 @@ import com.cm.inspection.pojo.dtos.hiddendangerreport.HiddenDangerReportDTO; import com.cm.inspection.pojo.vos.check.Check2VO; import com.cm.inspection.pojo.vos.check.CheckCompleteVO; import com.cm.inspection.pojo.vos.check.StreetToLeaderVO; +import org.activiti.engine.history.HistoricTaskInstance; import java.util.List; import java.util.Map; @@ -171,4 +172,12 @@ public interface ICheck2Service { * @param streetToLeaderVO */ void updateStreetToLeader(String checkId, StreetToLeaderVO streetToLeaderVO); + + /** + * 检查任务历史 + * + * @param checkId + * @return + */ + List listHistoricTask(String checkId); } diff --git a/src/main/java/com/cm/inspection/service/check/impl/Check2ServiceImpl.java b/src/main/java/com/cm/inspection/service/check/impl/Check2ServiceImpl.java index ccd6201..8084193 100644 --- a/src/main/java/com/cm/inspection/service/check/impl/Check2ServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/check/impl/Check2ServiceImpl.java @@ -31,6 +31,7 @@ import com.cm.inspection.service.process.IProcessService; import com.cm.inspection.service.taskcheck.ITaskCheckService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.activiti.engine.history.HistoricTaskInstance; import org.activiti.engine.task.Task; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -180,44 +181,26 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { @Override public SuccessResultList> listPageStreetOfMine(ListPage page) { - String userId = securityComponent.getCurrentUser().getUserId(); - List tasks = processService.listTaskByAssigneeAndVariableKey(userId, GridPersonnelTypeEnum.STREET.getValue()); - List checkIds = listLastCheckId(tasks); - if (checkIds.isEmpty()) { - return new SuccessResultList<>(new ArrayList<>(), 1, 0L); - } - page.getParams().put("checkIds", checkIds); - return listPage(page); + return listPageOfMine(page); } @Override public SuccessResultList> listPageDistrictDepartmentOfMine(ListPage page) { - String userId = securityComponent.getCurrentUser().getUserId(); - List tasks = processService.listTaskByAssigneeAndVariableKey(GridPersonnelTypeEnum.DISTRICT_DEPARTMENT.getValue(), userId); - List checkIds = listLastCheckId(tasks); - if (checkIds.isEmpty()) { - return new SuccessResultList<>(new ArrayList<>(), 1, 0L); - } - page.getParams().put("checkIds", checkIds); - return listPage(page); + return listPageOfMine(page); } @Override public SuccessResultList> listPageDistrictOfMine(ListPage page) { - String userId = securityComponent.getCurrentUser().getUserId(); - List tasks = processService.listTaskByAssigneeAndVariableKey(GridPersonnelTypeEnum.DISTRICT.getValue(), userId); - List checkIds = listLastCheckId(tasks); - if (checkIds.isEmpty()) { - return new SuccessResultList<>(new ArrayList<>(), 1, 0L); - } - page.getParams().put("checkIds", checkIds); - return listPage(page); + return listPageOfMine(page); } @Override public SuccessResultList> listPageCityOfMine(ListPage page) { - String userId = securityComponent.getCurrentUser().getUserId(); - List tasks = processService.listTaskByAssigneeAndVariableKey(GridPersonnelTypeEnum.CITY.getValue(), userId); + return listPageOfMine(page); + } + + private SuccessResultList> listPageOfMine(ListPage page) { + List tasks = processService.listTaskByAssignee(securityComponent.getCurrentUser().getUserId()); List checkIds = listLastCheckId(tasks); if (checkIds.isEmpty()) { return new SuccessResultList<>(new ArrayList<>(), 1, 0L); @@ -239,7 +222,8 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { Map params = getHashMap(4); params.put("summary", checkCompleteVO.getSummary()); params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.HANDLE.getValue()); - processService.saveTaskCompleteByTaskId(task.getId(), params); + processService.completeByTaskId(task.getId(), params); + LOG.debug("流程完成"); } @Override @@ -255,6 +239,11 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { } } + @Override + public List listHistoricTask(String checkId) { + return processService.listHistoricTaskInstanceByKeyAndValue(CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); + } + /** * 上报案件到委办局，逻辑：查找当前用户上级网格员，存在则将案件进行转发，否则抛出异常 * @@ -270,10 +259,10 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { Map params = getHashMap(4); params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.LEADER.getValue()); params.put(CheckProcessParamsEnum.LEADER.getValue(), LeaderTypeEnum.DEPARTMENT.getValue()); - params.put(GridPersonnelTypeEnum.DISTRICT_DEPARTMENT.getValue(), userId); + params.put(CheckProcessParamsEnum.HANDLER.getValue(), gridPersonnelPO.getUserId()); params.put("summary", summary); - processService.saveTaskCompleteByTaskId(task.getId(), params); + processService.completeByTaskId(task.getId(), params); } /** @@ -291,10 +280,10 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { Map params = getHashMap(4); params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.LEADER.getValue()); params.put(CheckProcessParamsEnum.LEADER.getValue(), LeaderTypeEnum.DISTRICT.getValue()); - params.put(GridPersonnelTypeEnum.DISTRICT_DEPARTMENT.getValue(), gridPersonnelDTO.getUserId()); + params.put(CheckProcessParamsEnum.HANDLER.getValue(), gridPersonnelDTO.getUserId()); params.put("summary", summary); - processService.saveTaskCompleteByTaskId(task.getId(), params); + processService.completeByTaskId(task.getId(), params); } /** @@ -306,8 +295,8 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { private void startCheckProcess(String token, String checkId, String grid, Check2VO check2VO) throws Exception { String businessKey = String.format("%s:%s", BUSINESS_KEY_PREFIX, checkId); Map params = getHashMap(16); - LOG.debug("开启流程v2"); - params.put(GridPersonnelTypeEnum.GRID.getValue(), grid); + LOG.debug("开启流程2"); + params.put(CheckProcessParamsEnum.HANDLER.getValue(), grid); processService.startProcessByName(IProcessService.BT_CHECK_REPORT_V2, businessKey, params); // 得到当前任务 Task task = processService.getTaskByAssigneeAndBusinessKey(grid, businessKey); @@ -317,12 +306,12 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { params.put(CheckProcessParamsEnum.IS_RE_REPORT.getValue(), 0); if (isAllPass == 0) { LOG.debug("没有全部通过，非复查"); - processService.setTaskVariableByTaskId(task.getId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); + params.put(CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId); } else { LOG.debug("全部通过，状态标记为完成"); updateCheckIsCompleteInfo(token, checkId, 1); } - processService.saveTaskCompleteByTaskId(task.getId(), params); + processService.completeByTaskId(task.getId(), params); } /** @@ -347,13 +336,13 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service { params.put(CheckProcessParamsEnum.IS_RE_REPORT.getValue(), 1); if (isAllPass == 0) { LOG.debug("没有全部通过，上报上级"); - processService.setTaskVariableByTaskId(task.getId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), reCheckId); - params.put(GridPersonnelTypeEnum.STREET.getValue(), leaderId); + params.put(CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), reCheckId); + params.put(CheckProcessParamsEnum.HANDLER.getValue(), leaderId); } else { LOG.debug("全部通过，状态标记为完成"); updateCheckIsCompleteInfo(token, reCheckId, 1); } - processService.saveTaskCompleteByTaskId(task.getId(), params); + processService.completeByTaskId(task.getId(), params); } /** diff --git a/src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java b/src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java index f67bd49..5d62e79 100644 --- a/src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java @@ -131,7 +131,7 @@ public class CheckServiceImpl extends BaseService implements ICheckService { String leaderUserId = gridPersonnelService.getLeaderId(userId, 0); params.put("leader", leaderUserId); } - processService.saveTaskCompleteByTaskId(task.getId(), params); + processService.completeByTaskId(task.getId(), params); return new SuccessResult(); } @@ -252,7 +252,7 @@ public class CheckServiceImpl extends BaseService implements ICheckService { LOG.debug("1.isCoordination：0, 不配合"); setLeaderCheck(token, userId, checkId, oldCheckId, task, params); } - processService.saveTaskCompleteByTaskId(task.getId(), params); + processService.completeByTaskId(task.getId(), params); } /** diff --git a/src/main/java/com/cm/inspection/service/process/IProcessService.java b/src/main/java/com/cm/inspection/service/process/IProcessService.java index bc5f100..8c11199 100644 --- a/src/main/java/com/cm/inspection/service/process/IProcessService.java +++ b/src/main/java/com/cm/inspection/service/process/IProcessService.java @@ -2,11 +2,13 @@ package com.cm.inspection.service.process; import org.activiti.engine.history.HistoricProcessInstance; import org.activiti.engine.history.HistoricTaskInstance; +import org.activiti.engine.history.HistoricVariableInstance; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; import java.util.List; import java.util.Map; +import java.util.Set; /** * When you feel like quitting. Think about why you started @@ -282,7 +284,7 @@ public interface IProcessService { * @param taskId * @param params */ - void saveTaskCompleteByTaskId(String taskId, Map params); + void completeByTaskId(String taskId, Map params); /** * 流程实例状态（通过流程ID） @@ -306,6 +308,31 @@ public interface IProcessService { */ List listHistoricTaskInstance(); + /** + * 历史任务实例列表 + * + * @param key 变量key + * @param value 变量value + * @return + */ + List listHistoricTaskInstanceByKeyAndValue(String key, Object value); + + /** + * 任务历史变量 + * + * @param taskId 任务ID + * @return + */ + List listHistoricVariableInstanceByKeyAndValue(String taskId); + + /** + * 任务历史变量 + * + * @param taskIds 任务ID集合 + * @return + */ + List listHistoricVariableInstanceByKeyAndValue(Set taskIds); + /** * 激活流程 * diff --git a/src/main/java/com/cm/inspection/service/process/impl/ProcessServiceImpl.java b/src/main/java/com/cm/inspection/service/process/impl/ProcessServiceImpl.java index 639bf87..4bead66 100644 --- a/src/main/java/com/cm/inspection/service/process/impl/ProcessServiceImpl.java +++ b/src/main/java/com/cm/inspection/service/process/impl/ProcessServiceImpl.java @@ -5,6 +5,7 @@ import com.cm.inspection.service.process.IProcessService; import org.activiti.engine.*; import org.activiti.engine.history.HistoricProcessInstance; import org.activiti.engine.history.HistoricTaskInstance; +import org.activiti.engine.history.HistoricVariableInstance; import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.runtime.ProcessInstance; import org.activiti.engine.task.Task; @@ -17,6 +18,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Set; /** * When you feel like quitting. Think about why you started @@ -242,7 +244,7 @@ public class ProcessServiceImpl implements IProcessService { @Override public void removeRuntimeVariablesByExecutionId(String executionId, List keys) { - + runtimeService.removeVariables(executionId, keys); } @Override @@ -256,7 +258,7 @@ public class ProcessServiceImpl implements IProcessService { } @Override - public void saveTaskCompleteByTaskId(String taskId, Map params) { + public void completeByTaskId(String taskId, Map params) { taskService.complete(taskId, params, true); } @@ -275,6 +277,21 @@ public class ProcessServiceImpl implements IProcessService { return historyService.createHistoricTaskInstanceQuery().list(); } + @Override + public List listHistoricTaskInstanceByKeyAndValue(String key, Object value) { + return historyService.createHistoricTaskInstanceQuery().taskVariableValueEquals(key, value).orderByHistoricTaskInstanceStartTime().asc().list(); + } + + @Override + public List listHistoricVariableInstanceByKeyAndValue(String taskId) { + return historyService.createHistoricVariableInstanceQuery().taskId(taskId).list(); + } + + @Override + public List listHistoricVariableInstanceByKeyAndValue(Set taskIds) { + return historyService.createHistoricVariableInstanceQuery().taskIds(taskIds).list(); + } + @Override public void activeProcessByProcessId(String processId) { runtimeService.activateProcessInstanceById(processId); diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 3a0cb86..48579b2 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -20,14 +20,14 @@ spring: max-request-size: 1GB datasource: druid: - url: jdbc:mysql://49.233.36.36:6688/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false -# url: jdbc:mysql://127.0.0.1:3306/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false +# url: jdbc:mysql://49.233.36.36:6688/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false + url: jdbc:mysql://127.0.0.1:3306/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false db-type: mysql driver-class-name: com.mysql.jdbc.Driver - username: wanggeng -# username: root - password: WenG>2132997 -# password: root +# username: wanggeng + username: root +# password: WenG>2132997 + password: root initial-size: 2 min-idle: 2 max-active: 5 diff --git a/src/main/resources/bpmn/bt-check-report-v2.bpmn20.bpmn b/src/main/resources/bpmn/bt-check-report-v2.bpmn20.bpmn index 65a0950..e53b7b3 100644 --- a/src/main/resources/bpmn/bt-check-report-v2.bpmn20.bpmn +++ b/src/main/resources/bpmn/bt-check-report-v2.bpmn20.bpmn @@ -3,7 +3,7 @@ 包头检查上报版本2 - + 网格员上报案件 @@ -17,7 +17,7 @@ 是否是复查 - + 乡镇街道受理案件 @@ -29,13 +29,13 @@ 旗县区处理人 - + 旗县区管理员处理 - + 旗县区委办局管理员处理案件 @@ -47,7 +47,7 @@ 旗县区管理员处理 - + 市管理员案件 @@ -152,50 +152,50 @@ - - + + - - + + - - + + - - + + - - - - + + + + - - + + - - + + - - - + + + - - + + - - + + @@ -203,51 +203,51 @@ - - + + - - + + - - - + + + - - + + - - - + + + - - + + - - + + - - + + - - - + + + - - + + diff --git a/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml b/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml index 6651a3c..903a176 100644 --- a/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml +++ b/src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml @@ -250,6 +250,10 @@ AND t1.user_id = #{userId} + + AND + t1.person_type = #{personType} + AND t1.leader_user_id = #{leaderUserId} diff --git a/src/main/resources/static/route/check2/list-district-department-of-mine.html b/src/main/resources/static/route/check2/list-district-department-of-mine.html index 3066042..6ff4a73 100644 --- a/src/main/resources/static/route/check2/list-district-department-of-mine.html +++ b/src/main/resources/static/route/check2/list-district-department-of-mine.html @@ -106,17 +106,6 @@
- - @@ -139,7 +128,7 @@ var laytpl = layui.laytpl; var common = layui.common; var resizeTimeout = null; - var tableUrl = 'api/check2/listpage-street-of-mine'; + var tableUrl = 'api/check2/listpage-district-department-of-mine'; // 初始化选择框、单选、复选模板 function initSelectRadioCheckboxTemplate(templateId, templateBoxId, data, callback) { @@ -253,7 +242,6 @@ height: $win.height() - 130, limit: 20, limits: [20, 40, 60, 80, 100, 200], - toolbar: '#headerToolBar', request: { pageName: 'page', limitName: 'rows' @@ -341,17 +329,21 @@ return infoDiv; } }, - {field:'col5', width: 120, title: '操作', align: 'center', + {field:'col5', width: 100, title: '操作', align: 'center', fixed: 'right', templet: function(row) { - var isCoordinationBtn = ''; - if(row.isCoordination != 1) { - isCoordinationBtn = '不配合'; - } var infoDiv = ''; - infoDiv += ''; - if(row.checkLng && row.checkLat) { - infoDiv += ''; - } + infoDiv += ''; + infoDiv += ''; + infoDiv += ''; infoDiv += '
'+ isCoordinationBtn +'
查看检查位置
' + + '' + + '
' + + '' + + '
' + + '
' + + '' + + '' + + '
' + + '
'; return infoDiv; } @@ -377,7 +369,6 @@ type: $('#type').val(), industry: $('#industry').val(), checkType: $('#checkType').val(), - isCoordination: $('#isCoordination').val(), isComplete: $('#isComplete').val(), area1: $('#area1').val(), area2: $('#area2').val(), @@ -388,29 +379,7 @@ page: { curr: currentPage }, - height: $win.height() - 90, - }); - } - // 删除 - function removeData(ids) { - top.dialog.msg(top.dataMessage.delete, { - time: 0, - btn: [top.dataMessage.button.yes, top.dataMessage.button.no], - shade: 0.3, - yes: function (index) { - top.dialog.close(index); - var layIndex; - top.restAjax.delete(top.restAjax.path('api/check2/remove/{ids}', [ids]), {}, null, function (code, data) { - top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000}); - reloadTable(); - }, function (code, data) { - top.dialog.msg(data.msg); - }, function () { - layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3}); - }, function () { - top.dialog.close(layIndex); - }); - } + height: $win.height() - 130, }); } initTable(); @@ -484,6 +453,32 @@ } }); + $(document).on('click', '.handle-complete', function() { + var checkId = this.dataset.checkId; + top.dialog.open({ + url: top.restAjax.path('route/check2/update-street-complete.html?checkId={checkId}', [checkId]), + title: '处理完成', + width: '400px', + height: '280px', + onClose: function() { + reloadTable(); + } + }); + }) + + $(document).on('click', '.handler-to-leader', function() { + var checkId = this.dataset.checkId; + top.dialog.open({ + url: top.restAjax.path('route/check2/update-to-leader.html?checkId={checkId}', [checkId]), + title: '上级处理', + width: '400px', + height: '280px', + onClose: function() { + reloadTable(); + } + }); + }) + // 联动事件 // area1 选择事件 // form.on('select(area1)', function(data) { diff --git a/src/main/resources/static/route/check2/list-street-of-mine.html b/src/main/resources/static/route/check2/list-street-of-mine.html index 900371c..14f8ea2 100644 --- a/src/main/resources/static/route/check2/list-street-of-mine.html +++ b/src/main/resources/static/route/check2/list-street-of-mine.html @@ -242,7 +242,6 @@ height: $win.height() - 130, limit: 20, limits: [20, 40, 60, 80, 100, 200], - toolbar: '#headerToolBar', request: { pageName: 'page', limitName: 'rows' @@ -334,10 +333,10 @@ templet: function(row) { var infoDiv = ''; infoDiv += ''; infoDiv += ''; infoDiv += '
' + - '' + + '' + '
' + - '' + + '' + '
' + '
' + @@ -454,21 +453,31 @@ } }); - table.on('tool(dataTable)', function(obj) { - var data = obj.data; - var event = obj.event; - if(event === 'handleCompleteEvent') { - top.dialog.open({ - url: top.restAjax.path('route/check2/update-street-complete.html?checkId={checkId}', [data.checkId]), - title: '处理完成', - width: '400px', - height: '350px', - onClose: function() { - reloadTable(); - } - }); - } - }); + $(document).on('click', '.handle-complete', function() { + var checkId = this.dataset.checkId; + top.dialog.open({ + url: top.restAjax.path('route/check2/update-street-complete.html?checkId={checkId}', [checkId]), + title: '处理完成', + width: '400px', + height: '280px', + onClose: function() { + reloadTable(); + } + }); + }) + + $(document).on('click', '.handler-to-leader', function() { + var checkId = this.dataset.checkId; + top.dialog.open({ + url: top.restAjax.path('route/check2/update-street-to-leader.html?checkId={checkId}', [checkId]), + title: '上级处理', + width: '400px', + height: '380px', + onClose: function() { + reloadTable(); + } + }); + }) // 联动事件 // area1 选择事件 diff --git a/src/main/resources/static/route/check2/update-street-complete.html b/src/main/resources/static/route/check2/update-street-complete.html index bfb2061..b4c4030 100644 --- a/src/main/resources/static/route/check2/update-street-complete.html +++ b/src/main/resources/static/route/check2/update-street-complete.html @@ -11,17 +11,11 @@ -
+
-
- - 上级列表/ - 提交 - -
-
+
@@ -64,8 +58,7 @@ top.dialog.confirm(top.dataMessage.commit, function(index) { top.dialog.close(index); var loadLayerIndex; - formData.field['content'] = wangEditorObj['content'].txt.html(); - top.restAjax.post(top.restAjax.path('api/check2/update-street-complete/{checkId}', [checkId]), formData.field, null, function(code, data) { + top.restAjax.put(top.restAjax.path('api/check2/update-street-complete/{checkId}', [checkId]), formData.field, null, function(code, data) { var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, { time: 0, btn: [top.dataMessage.button.yes], diff --git a/src/main/resources/static/route/check2/update-street-to-leader.html b/src/main/resources/static/route/check2/update-street-to-leader.html new file mode 100644 index 0000000..1d96758 --- /dev/null +++ b/src/main/resources/static/route/check2/update-street-to-leader.html @@ -0,0 +1,139 @@ + + + + + + + + + + + + + +
+
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+
+ +
+
+
+ +
+
+
+ + + + \ No newline at end of file diff --git a/src/main/resources/static/route/check2/update-to-leader.html b/src/main/resources/static/route/check2/update-to-leader.html new file mode 100644 index 0000000..f370df8 --- /dev/null +++ b/src/main/resources/static/route/check2/update-to-leader.html @@ -0,0 +1,119 @@ + + + + + + + + + + + + + +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+ + + + \ No newline at end of file