审批过程中审批意见丢失bug修改
parent
00d78e12aa
commit
9db1215e25
|
|
@ -134,6 +134,7 @@ public class XgfUserController extends BaseController {
|
||||||
PageData request = this.getPageData();
|
PageData request = this.getPageData();
|
||||||
PageData response = new PageData();
|
PageData response = new PageData();
|
||||||
response.put("list", xgfUserService.getApproveInfo(request));
|
response.put("list", xgfUserService.getApproveInfo(request));
|
||||||
|
response.put("flow", xgfUserService.getFlowInfo(request));
|
||||||
response.put("result", "success");
|
response.put("result", "success");
|
||||||
response.put("data", request);
|
response.put("data", request);
|
||||||
return response;
|
return response;
|
||||||
|
|
|
||||||
|
|
@ -28,4 +28,6 @@ public interface XgfUserService {
|
||||||
List<PageData> getAppointApproveList(Page page);
|
List<PageData> getAppointApproveList(Page page);
|
||||||
|
|
||||||
Object getApproveInfo(PageData request);
|
Object getApproveInfo(PageData request);
|
||||||
|
|
||||||
|
Object getFlowInfo(PageData request);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
@ -322,6 +323,105 @@ public class XgfUserServiceImpl implements XgfUserService {
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object getFlowInfo(PageData request) {
|
||||||
|
PageData condition = new PageData();
|
||||||
|
condition.put("FLOWS_ID", request.getString("XGF_USER_ID"));
|
||||||
|
|
||||||
|
PageData entity = xgfFlowsMapper.findById(condition);
|
||||||
|
|
||||||
|
List<PageData> list = new ArrayList<>();
|
||||||
|
|
||||||
|
PageData zero = new PageData();
|
||||||
|
zero.put("INDEX", "0");
|
||||||
|
zero.put("APPOINT_CORP_ID", entity.getString("APPOINT_ZERO_CORP_ID"));
|
||||||
|
zero.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ZERO_CORP_NAME"));
|
||||||
|
zero.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ZERO_DEPARTMENT_ID"));
|
||||||
|
zero.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ZERO_DEPARTMENT_NAME"));
|
||||||
|
zero.put("APPOINT_USER_ID", entity.getString("APPOINT_ZERO_USER_ID"));
|
||||||
|
zero.put("APPOINT_USER_NAME", entity.getString("APPOINT_ZERO_USER_NAME"));
|
||||||
|
zero.put("APPOINT_STATUS", entity.getString("APPOINT_ZERO_STATUS"));
|
||||||
|
zero.put("APPOINT_OPINION", entity.getString("APPOINT_ZERO_OPINION"));
|
||||||
|
zero.put("APPOINT_TIME", entity.getString("APPOINT_ZERO_TIME"));
|
||||||
|
list.add(zero);
|
||||||
|
PageData one = new PageData();
|
||||||
|
one.put("INDEX", "1");
|
||||||
|
one.put("APPOINT_CORP_ID", entity.getString("APPOINT_ONE_CORP_ID"));
|
||||||
|
one.put("APPOINT_CORP_NAME", entity.getString("APPOINT_ONE_CORP_NAME"));
|
||||||
|
one.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_ONE_DEPARTMENT_ID"));
|
||||||
|
one.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_ONE_DEPARTMENT_NAME"));
|
||||||
|
one.put("APPOINT_USER_ID", entity.getString("APPOINT_ONE_USER_ID"));
|
||||||
|
one.put("APPOINT_USER_NAME", entity.getString("APPOINT_ONE_USER_NAME"));
|
||||||
|
one.put("APPOINT_STATUS", entity.getString("APPOINT_ONE_STATUS"));
|
||||||
|
one.put("APPOINT_OPINION", entity.getString("APPOINT_ONE_OPINION"));
|
||||||
|
one.put("APPOINT_TIME", entity.getString("APPOINT_ONE_TIME"));
|
||||||
|
list.add(one);
|
||||||
|
PageData two = new PageData();
|
||||||
|
two.put("INDEX", "2");
|
||||||
|
two.put("APPOINT_CORP_ID", entity.getString("APPOINT_TWO_CORP_ID"));
|
||||||
|
two.put("APPOINT_CORP_NAME", entity.getString("APPOINT_TWO_CORP_NAME"));
|
||||||
|
two.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_TWO_DEPARTMENT_ID"));
|
||||||
|
two.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_TWO_DEPARTMENT_NAME"));
|
||||||
|
two.put("APPOINT_USER_ID", entity.getString("APPOINT_TWO_USER_ID"));
|
||||||
|
two.put("APPOINT_USER_NAME", entity.getString("APPOINT_TWO_USER_NAME"));
|
||||||
|
two.put("APPOINT_STATUS", entity.getString("APPOINT_TWO_STATUS"));
|
||||||
|
two.put("APPOINT_OPINION", entity.getString("APPOINT_TWO_OPINION"));
|
||||||
|
two.put("APPOINT_TIME", entity.getString("APPOINT_TWO_TIME"));
|
||||||
|
list.add(two);
|
||||||
|
PageData three = new PageData();
|
||||||
|
three.put("INDEX", "3");
|
||||||
|
three.put("APPOINT_CORP_ID", entity.getString("APPOINT_THREE_CORP_ID"));
|
||||||
|
three.put("APPOINT_CORP_NAME", entity.getString("APPOINT_THREE_CORP_NAME"));
|
||||||
|
three.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_THREE_DEPARTMENT_ID"));
|
||||||
|
three.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_THREE_DEPARTMENT_NAME"));
|
||||||
|
three.put("APPOINT_USER_ID", entity.getString("APPOINT_THREE_USER_ID"));
|
||||||
|
three.put("APPOINT_USER_NAME", entity.getString("APPOINT_THREE_USER_NAME"));
|
||||||
|
three.put("APPOINT_STATUS", entity.getString("APPOINT_THREE_STATUS"));
|
||||||
|
three.put("APPOINT_OPINION", entity.getString("APPOINT_THREE_OPINION"));
|
||||||
|
three.put("APPOINT_TIME", entity.getString("APPOINT_THREE_TIME"));
|
||||||
|
list.add(three);
|
||||||
|
PageData four = new PageData();
|
||||||
|
four.put("INDEX", "4");
|
||||||
|
four.put("APPOINT_CORP_ID", entity.getString("APPOINT_FOUR_CORP_ID"));
|
||||||
|
four.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FOUR_CORP_NAME"));
|
||||||
|
four.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FOUR_DEPARTMENT_ID"));
|
||||||
|
four.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FOUR_DEPARTMENT_NAME"));
|
||||||
|
four.put("APPOINT_USER_ID", entity.getString("APPOINT_FOUR_USER_ID"));
|
||||||
|
four.put("APPOINT_USER_NAME", entity.getString("APPOINT_FOUR_USER_NAME"));
|
||||||
|
four.put("APPOINT_STATUS", entity.getString("APPOINT_FOUR_STATUS"));
|
||||||
|
four.put("APPOINT_OPINION", entity.getString("APPOINT_FOUR_OPINION"));
|
||||||
|
four.put("APPOINT_TIME", entity.getString("APPOINT_FOUR_TIME"));
|
||||||
|
list.add(four);
|
||||||
|
PageData five = new PageData();
|
||||||
|
five.put("INDEX", "5");
|
||||||
|
five.put("APPOINT_CORP_ID", entity.getString("APPOINT_FIVE_CORP_ID"));
|
||||||
|
five.put("APPOINT_CORP_NAME", entity.getString("APPOINT_FIVE_CORP_NAME"));
|
||||||
|
five.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_FIVE_DEPARTMENT_ID"));
|
||||||
|
five.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_FIVE_DEPARTMENT_NAME"));
|
||||||
|
five.put("APPOINT_USER_ID", entity.getString("APPOINT_FIVE_USER_ID"));
|
||||||
|
five.put("APPOINT_USER_NAME", entity.getString("APPOINT_FIVE_USER_NAME"));
|
||||||
|
five.put("APPOINT_STATUS", entity.getString("APPOINT_FIVE_STATUS"));
|
||||||
|
five.put("APPOINT_OPINION", entity.getString("APPOINT_FIVE_OPINION"));
|
||||||
|
five.put("APPOINT_TIME", entity.getString("APPOINT_FIVE_TIME"));
|
||||||
|
list.add(five);
|
||||||
|
PageData six = new PageData();
|
||||||
|
six.put("INDEX", "6");
|
||||||
|
six.put("APPOINT_CORP_ID", entity.getString("APPOINT_SIX_CORP_ID"));
|
||||||
|
six.put("APPOINT_CORP_NAME", entity.getString("APPOINT_SIX_CORP_NAME"));
|
||||||
|
six.put("APPOINT_DEPARTMENT_ID", entity.getString("APPOINT_SIX_DEPARTMENT_ID"));
|
||||||
|
six.put("APPOINT_DEPARTMENT_NAME", entity.getString("APPOINT_SIX_DEPARTMENT_NAME"));
|
||||||
|
six.put("APPOINT_USER_ID", entity.getString("APPOINT_SIX_USER_ID"));
|
||||||
|
six.put("APPOINT_USER_NAME", entity.getString("APPOINT_SIX_USER_NAME"));
|
||||||
|
six.put("APPOINT_STATUS", entity.getString("APPOINT_SIX_STATUS"));
|
||||||
|
six.put("APPOINT_OPINION", entity.getString("APPOINT_SIX_OPINION"));
|
||||||
|
six.put("APPOINT_TIME", entity.getString("APPOINT_SIX_TIME"));
|
||||||
|
list.add(six);
|
||||||
|
PageData info = new PageData();
|
||||||
|
info.put("info", list);
|
||||||
|
info.put("STEP", entity.getString("FLOWS_STEP"));
|
||||||
|
return info;
|
||||||
|
}
|
||||||
|
|
||||||
/* 获取当前用户是否有权限审批 */
|
/* 获取当前用户是否有权限审批 */
|
||||||
private String getPower(PageData x) {
|
private String getPower(PageData x) {
|
||||||
switch (Integer.parseInt(x.get("CHECK_STEP").toString())) {
|
switch (Integer.parseInt(x.get("CHECK_STEP").toString())) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue