Skip to content

M
map-parent
Commit 1b5ac28b by 宋珺琪
Options

脑图审批 待我审批列表接口bug修改

parent 334396a5
Showing with 100 additions and 139 deletions
service/publicapi/src/main/java/com/founder/publicapi/controller/ApprovalService/OrderController.java
......@@ -131,10 +131,11 @@ public class OrderController {
@ResponseBody
@OperLog(czxxLbdm = "01" , yymcJyqk = "0206",czxxJyqk = "待我审批的申请单列表查询")
@ApiOperation(value = "审批_待我审批的申请单")
public MapRestResult allWaitApproveOrders(EasyUIPage page, Integer rows, TbstApproveOrder tbstApproveOrder){
page.setMysqlPagePara(rows);
page=orderService.queryMyApproveOrderList(page,tbstApproveOrder);
return new MapRestResult(200,page.getState(),page.getTotal(),page.getRows());
public MapRestResult allWaitApproveOrders(Integer page, Integer rows, TbstApproveOrder tbstApproveOrder){
// page.setMysqlPagePara(rows);
Map<String, Object> stringObjectMap = orderService.queryMyApproveOrderList(page, rows, tbstApproveOrder);
return new MapRestResult(200,"ok",stringObjectMap.get("total"),stringObjectMap.get("allList"));
}
/**
......
service/publicapi/src/main/java/com/founder/publicapi/controller/Database/DatabaseController.java
......@@ -37,15 +37,6 @@ public class DatabaseController {
/* int i = pageSize * (page - 1);
int j = pageSize;*/
List database = new ArrayList();
/* try
{
Class.forName("com.mysql.cj.jdbc.Driver"); //加载MYSQL JDBC驱动程序
System.out.println("Success loading Mysql Driver!");
}
catch (Exception e) {
e.printStackTrace();
return new MapRestResult().error("Error loading Mysql Driver!");
}*/
Connection connect = JDBCUtil.getConnection();
Statement stmt =null;
ResultSet rs = null;
......@@ -86,18 +77,6 @@ public class DatabaseController {
rs = stmt.executeQuery
("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间' from information_schema.tables where table_schema='skyp' and TABLE_NAME like '%"+table+"%'");
}
// ("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间' from information_schema.tables where table_schema='skyp' and TABLE_NAME like '%"+table+"%' and (TABLE_NAME like 'sk%' or TABLE_NAME like 'ksh%')");
/* if (StringUtil.isEmpty(table)){
//查询所有的
rs = stmt.executeQuery
("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间' from information_schema.tables where table_schema='skyp' ");//limit " + page + ","+pageSize+"
}else {
// 模糊查询
rs = stmt.executeQuery
("select TABLE_NAME '表名称',table_comment '表说明',CREATE_TIME '创建时间' from information_schema.tables where table_schema='skyp' and TABLE_NAME like '%"+table+"%' and (TABLE_NAME like 'sk%' or TABLE_NAME like 'ksh%')");
}*/
// sk 、 ksh 、xz 三种类型
while (rs.next())
{
Map<Object, Object> map = new HashMap<>();
......@@ -174,16 +153,6 @@ public class DatabaseController {
map.put("xz",xz);
rs.last();
}
/* while (rs.next())
{
int ksh = rs.getInt("count");
map.put("sk",ksh);
map.put("ksh",);
map.put("xz",);
}*/
}
catch (Exception e)
{
......@@ -205,21 +174,12 @@ public class DatabaseController {
@ApiOperation(value = "表详情")
public MapRestResult details(String table){
List<Map<Object, Object>> database = new ArrayList<>();
/* try
{
Class.forName("com.mysql.cj.jdbc.Driver"); //加载MYSQL JDBC驱动程序
System.out.println("Success loading Mysql Driver!");
}
catch (Exception e) {
e.printStackTrace();
return new MapRestResult().error("Error loading Mysql Driver!");
}*/
Connection connect = JDBCUtil.getConnection();
Statement stmt =null;
ResultSet rs = null;
try
{
// Connection connect = DriverManager.getConnection("jdbc:mysql://47.92.48.137:3900/skyp?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai", "root","gkptCcYy123");
// 连接URL为 jdbc:mysql//服务器地址/数据库名 ，后面的2个参数分别是登陆用户名和密码
stmt = connect.createStatement();
rs = stmt.executeQuery
......@@ -230,7 +190,6 @@ public class DatabaseController {
Map<Object, Object> map = new HashMap<>();
map.put("COLUMN_NAME",rs.getString("列名"));
map.put("COLUMN_TYPE",rs.getString("类型"));
// map.put("DATA_TYPE",rs.getString("类型"));
map.put("COLUMN_COMMENT",rs.getString("字段说明"));
database.add(map);
......
service/publicapi/src/main/java/com/founder/publicapi/controller/RyAndAj/RyAndAjController.java
......@@ -85,14 +85,10 @@ public class RyAndAjController {
public MapRestResult getTaskInfo(@RequestParam(name = "ajmc", required = false) String ajmc,
@RequestParam(name = "cbdw", required = false) String cbdw,
@RequestParam(name = "bhcx", required = false) String bhcx,
/* @RequestParam(name = "afstartTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime afstartTime,
@RequestParam(name = "afendTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime afendTime,*/
@RequestParam(name = "afstartTime", required = false) String afstartTime,
@RequestParam(name = "afendTime", required = false) String afendTime,
@RequestParam(name = "zcjddm", required = false) String zcjddm,
@RequestParam(name = "state", required = false) String state,
/* @RequestParam(name = "cjstartTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime cjstartTime,
@RequestParam(name = "cjendTime", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime cjendTime,*/
@RequestParam(name = "cjstartTime", required = false) String cjstartTime,
@RequestParam(name = "cjendTime", required = false) String cjendTime,
@RequestParam(name = "zjhm", required = false) String zjhm,
......@@ -103,7 +99,6 @@ public class RyAndAjController {
wrapper.eq(!StringUtil.isEmpty(ajmc),"ajmc", ajmc);
wrapper.eq(!StringUtil.isEmpty(cbdw),"sldw_gajgmc", cbdw);
wrapper.eq(!StringUtil.isEmpty(bhcx),"asjbh", bhcx);
// if (ObjectUtil.isNotNull( afstartTime) && ObjectUtil.isNotNull(afendTime)) {
if (!StringUtil.isEmpty( afstartTime) && !StringUtil.isEmpty(afendTime)) {
wrapper.apply("asjfssj_asjfskssj between'" + afstartTime.toString() + "' and '" + afendTime.toString() +"'" );
} else if (!StringUtil.isEmpty( afstartTime)) {
......@@ -394,41 +389,6 @@ public class RyAndAjController {
@PostMapping("selectBqXqByZjhm")
public MapRestResult selectBqXqByZjhm(@RequestParam String zjhm,@RequestParam String type,@RequestParam String bq){
/* BqXqByZjhmResult result = new BqXqByZjhmResult();
//查案事件编号
QueryWrapper<TbXwZbfzxyr> wrapper = new QueryWrapper<>();
wrapper.select("asjbh").eq("zhfzxyr_cyzj_zjhm",zjhm);
List<TbXwZbfzxyr> selectasjbh = zbFzxyrDataMapper.selectList(wrapper);
for (TbXwZbfzxyr tbXwZbfzxyr: selectasjbh) {
//asjbh
String asjbh = tbXwZbfzxyr.getAsjbh();
if (type.equals("rybq")){
}else if (type.equals("ajbq")){
}
//去案件表查 时间 名称 案情
TbStAsj tbStAsj = tbStAsjMapper.selectbqxxByasjbh(asjbh);
result.setFzbq(bq);
result.setBsh(asjbh);
result.setCjsj(tbStAsj.getAsjfssjAsjfskssj());
result.setCjdw(tbStAsj.getLadwGajgmc());
result.setJyqk(tbStAsj.getJyaq());
//去标签表查标签
QueryWrapper<TbStAjtztq> wrapper1 = new QueryWrapper<>();
wrapper1.eq("asjbh",asjbh);
List<TbStAjtztq> tbStAjtztqs = tbStAjtztqMapper.selectList(wrapper1);
for (TbStAjtztq stAjtztq : tbStAjtztqs) {
result.setSjly(stAjtztq.getSjly());
}
}*/
/* if (type.equals("人员标签")){
type = "rybq";
}else if (type.equals("案件标签")){
type = "ajbq";
}*/
List re = new ArrayList<>();
BqXqByZjhmResult selectbqxx = tbStAsjMapper.selectbqxx(zjhm, type, bq);
re.add(selectbqxx);
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/OrderMapper.xml
......@@ -591,7 +591,6 @@
)
</if>
order by t.CREATE_TIME desc
limit #{orderParam.startNum},#{orderParam.endNum}
</select>
<select id="queryDwspPlclListPage" resultType="com.founder.commonutils.model.newPublicEntity.ApprovalEntity.TbstApproveOrder">
SELECT
......
service/publicapi/src/main/java/com/founder/publicapi/mapper/mysqlMapper/xml/SkRegionalsTaskMapper.xml
......@@ -114,9 +114,15 @@
<if test="jssj!= null and jssj!=''">
AND a.fssj <![CDATA[<=]]> DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
</if>
<if test="state != null and state != ''">
AND a.state = #{state , jdbcType=VARCHAR }
</if>
<if test="state == 1">
AND (a.state = '1' or a.state = '2')
</if>
<if test="state == 2">
AND a.state = '3'
</if>
<if test="state == 3">
AND (a.state = '1' or a.state = '2' or a.state = '3')
</if>
<if test="taskId != null and taskId != ''">
AND a.taskId = #{taskId , jdbcType=VARCHAR }
</if>
......@@ -146,8 +152,14 @@
<if test="jssj!= null and jssj!=''">
AND a.fssj <![CDATA[<=]]> DATE_FORMAT(#{jssj},'%Y-%m-%d %H:%i:%S')
</if>
<if test="state != null and state != ''">
AND a.state = #{state , jdbcType=VARCHAR }
<if test="state == 1">
AND (a.state = '1' or a.state = '2')
</if>
<if test="state == 2">
AND a.state = '3'
</if>
<if test="state == 3">
AND (a.state = '1' or a.state = '2' or a.state = '3')
</if>
<if test="taskId != null and taskId != ''">
AND a.taskId = #{taskId , jdbcType=VARCHAR }
......
service/publicapi/src/main/java/com/founder/publicapi/service/OrderService.java
......@@ -32,7 +32,7 @@ public interface OrderService {
Boolean updateXsStatus(String orderCode) throws Exception;
//获取我名下未审的申请单
EasyUIPage queryMyApproveOrderList(EasyUIPage page, TbstApproveOrder tbstApproveOrder);
Map<String,Object> queryMyApproveOrderList(Integer page,Integer rows, TbstApproveOrder tbstApproveOrder);
Map<String,Object> queryDwspPlspOrderList(String jh);
......
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/OrderServiceImpl.java
......@@ -8,6 +8,8 @@ import com.founder.commonutils.util.KeyUtilNaotu;
import com.founder.commonutils.util.StringUtil;
import com.founder.publicapi.mapper.mysqlMapper.*;
import com.founder.publicapi.service.OrderService;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
......@@ -462,10 +464,10 @@ public class OrderServiceImpl implements OrderService {
}
@Override
public EasyUIPage queryMyApproveOrderList(EasyUIPage page, TbstApproveOrder tbstApproveOrder) {
public Map<String,Object> queryMyApproveOrderList(Integer page,Integer rows, TbstApproveOrder tbstApproveOrder) {
TbstApproveOrder param = new TbstApproveOrder();
param.setStartNum(page.getBegin());
param.setEndNum(page.getEnd());
/* param.setStartNum(page.getBegin());
param.setEndNum(page.getEnd());*/
String kssj = tbstApproveOrder.getTimeStart();
String jssj = tbstApproveOrder.getTimeEnd();
if(!StringUtil.isEmpty(kssj) && !StringUtil.isEmpty(jssj)){
......@@ -484,34 +486,34 @@ public class OrderServiceImpl implements OrderService {
String pliceId = tbstApproveOrder.getCreateUserPid();
List<TbstApproveOrder> allList = new ArrayList<>();
EasyUIPage page1 = null;
List allList = new ArrayList<>();
/* EasyUIPage page1 = null;
EasyUIPage page2 = null;
EasyUIPage pageS = null;
int total1=0;
EasyUIPage pageS = null;*/
/* int total1=0;
int total2=0;
int totalS=0;
int totalS=0;*/
page1 = queryYjsp(param,pliceId);
page2 = queryEjsp(param,pliceId);
pageS = querySqtssp(param,pliceId);
List list1 = queryYjsp(param, pliceId);
List list2 = queryEjsp(param, pliceId);
List list3 = querySqtssp(param, pliceId);
if(page1!=null){
total1 = page1.getTotal();
if(total1>0){
allList.addAll((List<TbstApproveOrder>)page1.getRows());
if(list1!=null){
int size1 = list1.size();
if(size1>0){
allList.addAll(list1);
}
}
if(page2!=null){
total2 = page2.getTotal();
if(total2>0){
allList.addAll((List<TbstApproveOrder>)page2.getRows());
if(list2!=null){
int size2 = list2.size();
if(size2 > 0){
allList.addAll(list2);
}
}
if(pageS!=null){
totalS = pageS.getTotal();
if(totalS>0){
allList.addAll((List<TbstApproveOrder>)pageS.getRows());
if(list3!=null){
int size3 = list3.size();
if(size3>0){
allList.addAll(list3);
}
}
......@@ -525,11 +527,32 @@ public class OrderServiceImpl implements OrderService {
}
});
int total = list1.size()+list2.size()+list3.size();
if (total > rows) {
int toIndex = rows * page;
if (toIndex > total) {
toIndex = total;
}
allList = allList.subList(rows * (page - 1), toIndex);
}
Page<List> pa = new Page<>(page, rows);
pa.addAll(allList);
pa.setPages((total + rows - 1) / rows);
pa.setTotal(total);
page.setTotal(total1+total2+totalS);
PageInfo<List> pageInfo = new PageInfo(pa);
List<List> list = pageInfo.getList();
HashMap<String, Object> map = new HashMap<>();
map.put("total",total);
map.put("allList",list);
/* page.setTotal(total);
page.setRows(allList);
page.setState("success");
return page;
page.setState("success");*/
return map;
}
@Override
......@@ -648,8 +671,8 @@ public class OrderServiceImpl implements OrderService {
}
//一级领导审批
private EasyUIPage queryYjsp(TbstApproveOrder order, String policeId){
EasyUIPage page = new EasyUIPage();
private List queryYjsp(TbstApproveOrder order, String policeId){
// EasyUIPage page = new EasyUIPage();
int orderOneCount=0;
int ptCount = 0;
int jjCount = 0;
......@@ -690,18 +713,18 @@ public class OrderServiceImpl implements OrderService {
orderOneList.addAll(getXsOrder(orderPtList));
orderOneCount +=ptCount;
}
if(orderOneList.size()>0){
/* if(orderOneList.size()>0){
page.setRows(orderOneList);
page.setTotal(orderOneCount);
}
}*/
} catch (Exception e) {
e.printStackTrace();
}
return page;
return orderOneList;
}
//二级领导和代理审批
private EasyUIPage queryEjsp(TbstApproveOrder param, String policeId){
EasyUIPage page = new EasyUIPage();
private List queryEjsp(TbstApproveOrder param, String policeId){
// EasyUIPage page = new EasyUIPage();
int orderCount=0;
int jjCount=0;
int ptCount=0;
......@@ -716,17 +739,17 @@ public class OrderServiceImpl implements OrderService {
orderStatusList.add(OrderStatusEnum.ONE_GRADE_AUDITED.getCode());
try {
orderCount=orderMapper.queryMyOrderListTotalCount(param,orderStatusList,dealPid);
page.setTotal(orderCount);
// page.setTotal(orderCount);
if(orderCount>0){
orderList=orderMapper.queryMyOrderListPage(param,orderStatusList,dealPid);
orderList = getXsOrder(orderList);
page.setRows(orderList);
// page.setRows(orderList);
}
} catch (Exception e) {
e.printStackTrace();
}
return page;
return orderList;
}
//一级领导审批(批量审批)
private EasyUIPage queryPlYjsp(TbstApproveOrder order, String policeId){
......@@ -829,8 +852,8 @@ public class OrderServiceImpl implements OrderService {
return page;
}
//双签同事审批
private EasyUIPage querySqtssp(TbstApproveOrder param, String policeId){
EasyUIPage page = new EasyUIPage();
private List querySqtssp(TbstApproveOrder param, String policeId){
// EasyUIPage page = new EasyUIPage();
int orderCount=0;
List<TbstApproveOrder> orderList = new ArrayList<>();
param.setOrderOnegradePid(null);
......@@ -844,17 +867,17 @@ public class OrderServiceImpl implements OrderService {
try {
orderCount=orderMapper.queryMyOrderListTotalCount(param,orderStatusList, dealPid);
page.setTotal(orderCount);
// page.setTotal(orderCount);
if(orderCount>0){
orderList=orderMapper.queryMyOrderListPage(param,orderStatusList, dealPid);
orderList = getXsOrder(orderList);
page.setRows(orderList);
// page.setRows(orderList);
}
} catch (Exception e) {
e.printStackTrace();
}
return page;
return orderList;
}
@Override
......
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/PzServiceImpl.java
......@@ -75,7 +75,7 @@ public class PzServiceImpl implements PzService {
jsonObject.put("data","");
jsonObject.put("count","");
}else{
jsonObject.put("status",201);
jsonObject.put("status",200);
jsonObject.put("msg","卷宗删除失败");
jsonObject.put("data","");
jsonObject.put("count","");
......
service/publicapi/src/main/java/com/founder/publicapi/service/serviceimpl/UserServiceImpl.java
......@@ -308,15 +308,15 @@ public class UserServiceImpl implements UserService {
resultMap.put("data","");
resultMap.put("status",200);
}else{
resultMap.put("msg","fail");
resultMap.put("msg","删除失败");
resultMap.put("data","");
resultMap.put("status",201);
resultMap.put("status",200);
}
}catch (Exception e){
e.printStackTrace();
resultMap.put("msg","error");
resultMap.put("msg","删除异常");
resultMap.put("data","");
resultMap.put("status",201);
resultMap.put("status",200);
}
return resultMap;
}
......
service/publicapi/src/main/resources/bootstrap-prod.properties
......@@ -34,6 +34,13 @@ hnkshDownloadFilePath = http://47.92.48.137:1009/excel/kshExcel/
#\u6570\u636E\u5206\u6790\u4E0B\u8F7D\u6A21\u677F\u7684\u8DEF\u5F84
hnkshDownloadExcelTemplatePath = http://47.92.48.137:1009/excel/kshExcel/ExcelTemplate.xls
#\u5377\u5B97\u4E0A\u4F20\u7684\u8DEF\u5F84
approvalFilePath = /data/excel/approvalWord/
#\u65B0\u589E\u5377\u5B97\u5927\u6570\u636E\u6A21\u578B\u4E0B\u8F7D\u8DEF\u5F84
approvalDownload = http://47.92.48.137:1009/excel/approvalWord/
#\u65B0\u589E\u5377\u5B97\u5927\u6570\u636E\u6A21\u578B\u4E0B\u8F7D\u6A21\u677F\u7684\u8DEF\u5F84
approvalDownloadTemplate = http://47.92.48.137:1009/excel/approvalWord/ApprovalWordTemplate.docx
#xml\u0268\uFFFD\uFFFD
mybatis-plus.mapper-locations=classpath*:com/founder/publicapi/mapper/*/xml/*.xml
#es\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0631\uFFFD
......
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