From b848451e8889fea12ce40b7818c1b8d84b50ea02 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 01 九月 2022 13:41:07 +0800
Subject: [PATCH] 权限管理组合操作
---
src/main/java/com/whyc/service/WorksheetMainService.java | 480 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 460 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/whyc/service/WorksheetMainService.java b/src/main/java/com/whyc/service/WorksheetMainService.java
index 23ae74b..51b4873 100644
--- a/src/main/java/com/whyc/service/WorksheetMainService.java
+++ b/src/main/java/com/whyc/service/WorksheetMainService.java
@@ -4,21 +4,27 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
+import com.whyc.config.EnumWorksheetType;
import com.whyc.dto.Response;
+import com.whyc.dto.WorksheetMainDTO;
+import com.whyc.dto.WorksheetMainDTO2;
import com.whyc.mapper.DocUserMapper;
import com.whyc.mapper.WorksheetLinkMapper;
import com.whyc.mapper.WorksheetMainMapper;
-import com.whyc.pojo.DocUser;
-import com.whyc.pojo.ProductBomApproving;
-import com.whyc.pojo.WorksheetLink;
-import com.whyc.pojo.WorksheetMain;
-import io.swagger.models.auth.In;
+import com.whyc.pojo.*;
+import com.whyc.util.CommonUtil;
+import com.whyc.util.Zip4jUtil;
+import org.aspectj.util.FileUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -39,18 +45,53 @@
private DocUserMapper userMapper;
@Autowired
+ @Lazy
private ProductBomApprovingService approvingService;
+ @Autowired
+ private ProductApprovingService paService;
+
+ @Autowired
+ private MaterialProductApprovingService cpApprovingService;
+
+ @Autowired
+ private MaterialApprovingService mApprovingService;
+
+ @Autowired
+ private MaterialService mService;
+
+ @Autowired
+ private ProductBomService pbService;
+
+ @Autowired
+ private MaterialProductHistoryService cphService;
+
+ @Autowired
+ private ProductSoftwareApprovingService psaService;
+
+ @Autowired
+ private ProductSoftwareService productSoftwareService;
+
+ @Autowired
+ private ProductService productService;
+
+ @Autowired
+ private ProductHistoryService productHistoryService;
+
@Transactional
- public boolean submit(WorksheetMain main, DocUser user) {
- List<ProductBomApproving> bomList = main.getApprovingBomList();
+ public boolean submit(WorksheetMain main, DocUser user) throws IOException {
+ main.setType(1);
+ ProductApproving productApproving = main.getProductApproving();
+ List<ProductBomApproving> bomList = productApproving.getBomApprovingList();
//鎻愪氦涓昏〃
main.setCreateUserId(user.getId());
//鎻愪氦浜鸿鑹叉潵鍒ゆ柇宸ヤ綔娴佸眰绾�
if(user.getRoleId().equals("1001")){
- main.setLevel(2);
- main.setStatus(1);
- mainMapper.insert(main);
+ if(main.getId()==null) {
+ main.setLevel(2);
+ main.setStatus(1);
+ mainMapper.insert(main);
+ }
//鎻愪氦瀛愯〃
WorksheetLink link =new WorksheetLink();
link.setMainId(main.getId());
@@ -63,9 +104,11 @@
linkMapper.insert(link);
}
else if(user.getRoleId().equals("1002")){
- main.setLevel(1);
- main.setStatus(2);
- mainMapper.insert(main);
+ if(main.getId()==null) {
+ main.setLevel(1);
+ main.setStatus(2);
+ mainMapper.insert(main);
+ }
//鎻愪氦瀛愯〃
WorksheetLink link =new WorksheetLink();
link.setMainId(main.getId());
@@ -85,9 +128,370 @@
return false;
}
//浜у搧bom/鍥剧焊鍥剧墖鎻愪氦
- bomList.forEach(bom->bom.setMainId(main.getId()));
+ if(productApproving.getCustomCode()!=null && bomList.get(0).getId()!=null) { //涓庡墠绔害瀹� 瀹氬埗琛ㄥ崟鍙峰叧鑱斾骇鍝�,鍒欏叧鑱旂殑浜у搧id鍐欏叆id
+ Product product = productService.getById(bomList.get(0).getId());
+ List<ProductBom> productBomList = pbService.getBomByProductId(bomList.get(0).getId());
+ //product涓嬬殑鍥剧焊澶嶅埗鍒版柊鐨勫鎵硅矾寰�
+ String rootFile = CommonUtil.getRootFile();
+ String dateFormat = new SimpleDateFormat("YYYY-MM").format(new Date());
+ long timeStamp = System.currentTimeMillis();
+ String filePath = rootFile + "product_approving" + File.separator + user.getName() + File.separator + dateFormat+ File.separator + timeStamp;
+ String inFilePath = rootFile + "product" + File.separator + product.getParentModel() + File.separator + "standard"+ File.separator + product.getVersion();
+ File parentFile = new File(filePath);
+ //FileCopyUtils.copy(new File(inFilePath),parentFile);
+ FileUtil.copyDir(new File(inFilePath),parentFile);
+ productApproving.setFileUrl(filePath);
+ bomList.clear();
+ productBomList.forEach(bom->{
+ ProductBomApproving approving = new ProductBomApproving();
+ approving.setCategory(bom.getCategory());
+ approving.setSubCode(bom.getSubCode());
+ approving.setSubName(bom.getSubName());
+ approving.setSubModel(bom.getSubModel());
+ approving.setUnit(bom.getUnit());
+ approving.setQuantity(bom.getQuantity());
+ approving.setProducer(bom.getProducer());
+ approving.setMaterial(bom.getMaterial());
+ approving.setThickness(bom.getThickness());
+ approving.setSurfaceDetail(bom.getSurfaceDetail());
+ approving.setNotes(bom.getNotes());
+
+ bomList.add(approving);
+ });
+ }
+ //鍐荤粨(涓嶅惎鐢�)宸插瓨鍦ㄧ殑浜у搧缂栫爜+瀹氬埗淇濆崟鍙�
+ productService.deleteByParentCodeAndCustomCode(productApproving.getParentCode(),productApproving.getCustomCode());
+ productHistoryService.updateEnabledStatus(productApproving.getParentCode(),productApproving.getCustomCode(),0);
+
+ productApproving.setMainId(main.getId());
+ productApproving.setCreateTime(new Date());
+ paService.insert(productApproving);
+
+ bomList.forEach(bom->{
+ //bom.setMainId(main.getId());
+ bom.setProductApprovingId(productApproving.getId());
+ bom.setUpUserId(user.getId());
+ bom.setCreateDate(new Date());
+ if(bom.getDwgUrl()==null){
+ bom.setDwgUrl("");
+ }else {
+ bom.setDwgUrl(bom.getDwgUrl());
+ }
+ if(bom.getFileUrl()==null){
+ bom.setFileUrl("");
+ }else {
+ bom.setFileUrl(bom.getFileUrl());
+ }
+ if(bom.getPictureUrl()==null){
+ bom.setPictureUrl("");
+ }else{
+ bom.setPictureUrl(bom.getPictureUrl());
+ }
+ });
approvingService.insert(bomList);
return true;
+ }
+
+ public boolean MaterialProductSubmit(WorksheetMainDTO mainDTO, DocUser user) {
+ List<MaterialProductApproving> approvingList = new LinkedList<>();
+ WorksheetMain main = mainDTO.getMain();
+ List<MaterialProductApproving> addedList = mainDTO.getAddedList();
+ //List<MaterialProductApproving> replacedList = mainDTO.getReplacedList();
+ List<MaterialProductApproving> removedList = mainDTO.getRemovedList();
+
+ main.setType(EnumWorksheetType.MaterialProduct.getType());
+ //鎻愪氦涓昏〃
+ main.setCreateUserId(user.getId());
+ //鎻愪氦浜鸿鑹叉潵鍒ゆ柇宸ヤ綔娴佸眰绾�
+ if(user.getRoleId().equals("1001")){
+ if(main.getId()==null) {
+ main.setLevel(2);
+ main.setStatus(1);
+ mainMapper.insert(main);
+ }
+ //鎻愪氦瀛愯〃
+ WorksheetLink link =new WorksheetLink();
+ link.setMainId(main.getId());
+ link.setParentId(0);
+ link.setDealUserId(main.getNextUser());
+ link.setDealType(1);
+ link.setDealDesc(main.getDealDesc());
+ link.setLinkStatus(0);
+ link.setEnableArchive(0);
+ linkMapper.insert(link);
+ }
+ else if(user.getRoleId().equals("1002")){
+ if(main.getId()==null) {
+ main.setLevel(1);
+ main.setStatus(2);
+ mainMapper.insert(main);
+ }
+ //鎻愪氦瀛愯〃
+ WorksheetLink link =new WorksheetLink();
+ link.setMainId(main.getId());
+ link.setParentId(0);
+ link.setDealUserId(main.getNextUser());
+ link.setDealType(2);
+ link.setDealDesc(main.getDealDesc());
+ link.setLinkStatus(0);
+ link.setEnableArchive(1);
+ linkMapper.insert(link);
+ }
+ else if(user.getRoleId().equals("1003")){
+ main.setLevel(0);
+ main.setStatus(5);
+ mainMapper.insert(main);
+ }else{
+ return false;
+ }
+ //鐗╂枡-浜у搧瀹℃壒鎻愪氦
+ if(addedList!=null && addedList.size()!=0){
+ addedList.forEach(item->{
+ item.setMainId(main.getId());
+ item.setLinkType(1);
+ });
+ approvingList.addAll(addedList);
+ }
+ /*if(replacedList!=null && replacedList.size()!=0){
+ replacedList.forEach(item->{
+ item.setMainId(main.getId());
+ item.setLinkType(2);
+ });
+ approvingList.addAll(replacedList);
+ }*/
+ if(removedList!=null && removedList.size()!=0){
+ removedList.forEach(item->{
+ item.setMainId(main.getId());
+ item.setLinkType(-1);
+ });
+ approvingList.addAll(removedList);
+ }
+ cpApprovingService.insert(approvingList);
+ return true;
+ }
+
+ public Response materialSubmit(WorksheetMain main, DocUser user) {
+ Response<Object> response = new Response<>();
+ List<MaterialApproving> mApprovingList = main.getMApprovingList();
+ //鍒ゆ柇鏄柊澧炶繕鏄垹闄�
+ boolean isAdded = mApprovingList.get(0).getSubName()!=null;
+ if(isAdded) { //鏂板
+ //鏌ヨ鏄惁鏈� 宸茬敓鏁堟垨鑰呭凡鎻愪氦瀹℃壒鐨� 鐩稿悓鐨勭墿鏂�
+ List<Material> existMaterialList = new LinkedList<>();
+ List<MaterialApproving> existCAList = new LinkedList<>();
+
+ List<Material> materialList = mService.getList();
+ List<MaterialApproving> cAList = mApprovingService.getListByStatus(1);
+ for (int i = 0; i < mApprovingList.size(); i++) {
+ MaterialApproving materialApproving = mApprovingList.get(i);
+ for (int j = 0; j < materialList.size(); j++) {
+ if (materialApproving.getSubCode().equals(materialList.get(j).getSubCode())
+ && materialApproving.getSubName().equals(materialList.get(j).getSubName())
+ && materialApproving.getSubModel().equals(materialList.get(j).getSubModel())
+ ) {
+ existMaterialList.add(materialList.get(j));
+ }
+ }
+
+ for (int j = 0; j < cAList.size(); j++) {
+ if (materialApproving.getSubCode().equals(cAList.get(j).getSubCode())
+ && materialApproving.getSubName().equals(cAList.get(j).getSubName())
+ && materialApproving.getSubModel().equals(cAList.get(j).getSubModel())
+ ) {
+ existCAList.add(cAList.get(j));
+ }
+ }
+ }
+
+ int existCASize = existCAList.size();
+ int existMaterialSize = existMaterialList.size();
+ if (existCASize != 0) {
+ if (existMaterialSize != 0) {
+ response.setII(21, existCAList, existMaterialList, "閲嶅鎻愪氦:鐜版湁鐗╂枡鍙婃鍦ㄨ繘琛屽鎵圭殑鐗╂枡涓�,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勭墿鏂�");
+ } else {
+ response.set(22, existCAList, "閲嶅鎻愪氦:姝ｅ湪杩涜瀹℃壒鐨勭墿鏂欎腑,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勭墿鏂�");
+ }
+ return response;
+ } else {
+ if (existMaterialSize != 0) {
+ return response.setII(23, null, existMaterialList, "閲嶅鎻愪氦:鐜版湁鐗╂枡涓�,瀛樺湪褰撳墠鎻愪氦涓婁紶鐨勭墿鏂�");
+ }
+ }
+ }else{ //鍒犻櫎
+ //鍒ゆ柇鏄惁鍦ㄧ墿鏂欏鎵瑰垹闄や腑,鏄惁瀛樺湪浜у搧鍏宠仈鍙婂叧鑱斿鎵�
+ MaterialApproving deleteApproving = new MaterialApproving();
+ List<MaterialProductHistory> existMaterialProducts = new LinkedList<>();
+ List<MaterialProductApproving> existMaterialProductApprovingList = new LinkedList<>();
+ deleteApproving = mApprovingService.getListByMaterialId(mApprovingList.get(0).getMaterialId());
+
+ //鏌ョ湅浜у搧鍏宠仈
+ List<MaterialProductHistory> cphLatestExistList = cphService.getLatestExistListByMaterialId(mApprovingList.get(0).getMaterialId());
+ //鏌ョ湅浜у搧鍏宠仈瀹℃壒
+ List<MaterialProductApproving> cpaLatestExistList = cpApprovingService.getLatestExistListByMaterialId(mApprovingList.get(0).getMaterialId());
+ if(deleteApproving!=null){
+ return response.set(31,deleteApproving,"鎷掔粷鏈鍒犻櫎鐢宠,褰撳墠鐗╂枡姝ｅ湪杩涜鍒犻櫎瀹℃壒");
+ }
+ if(cphLatestExistList!=null && cphLatestExistList.size()!=0){
+ if(cpaLatestExistList!=null && cpaLatestExistList.size()!=0){
+ return response.setII(32,cpaLatestExistList,cphLatestExistList,"鎷掔粷鏈鍒犻櫎鐢宠,褰撳墠鏁ｈ宸茬粡鍏宠仈浜у搧鍙婂湪浜у搧鍏宠仈瀹℃壒");
+ }else{
+ return response.setII(33,null,cphLatestExistList,"鎷掔粷鏈鍒犻櫎鐢宠,褰撳墠鐗╂枡鍦ㄤ骇鍝佸叧鑱斿鎵�");
+ }
+ }else{
+ if(cpaLatestExistList!=null && cpaLatestExistList.size()!=0){
+ return response.set(34,cpaLatestExistList,"鎷掔粷鏈鍒犻櫎鐢宠,褰撳墠鐗╂枡宸茬粡鍏宠仈浜у搧");
+ }
+ }
+
+ }
+ main.setType(EnumWorksheetType.Material.getType());
+ //鎻愪氦涓昏〃
+ main.setCreateUserId(user.getId());
+ //鎻愪氦浜鸿鑹叉潵鍒ゆ柇宸ヤ綔娴佸眰绾�
+ if(user.getRoleId().equals("1001")){
+ if(main.getId()==null) {
+ main.setLevel(2);
+ main.setStatus(1);
+ mainMapper.insert(main);
+ }
+ //鎻愪氦瀛愯〃
+ WorksheetLink link =new WorksheetLink();
+ link.setMainId(main.getId());
+ link.setParentId(0);
+ link.setDealUserId(main.getNextUser());
+ link.setDealType(1);
+ link.setDealDesc(main.getDealDesc());
+ link.setLinkStatus(0);
+ link.setEnableArchive(0);
+ linkMapper.insert(link);
+ }
+ else if(user.getRoleId().equals("1002")){
+ if(main.getId()==null) {
+ main.setLevel(1);
+ main.setStatus(2);
+ mainMapper.insert(main);
+ }
+ //鎻愪氦瀛愯〃
+ WorksheetLink link =new WorksheetLink();
+ link.setMainId(main.getId());
+ link.setParentId(0);
+ link.setDealUserId(main.getNextUser());
+ link.setDealType(2);
+ link.setDealDesc(main.getDealDesc());
+ link.setLinkStatus(0);
+ link.setEnableArchive(1);
+ linkMapper.insert(link);
+ }
+ else if(user.getRoleId().equals("1003")){
+ main.setLevel(0);
+ main.setStatus(5);
+ mainMapper.insert(main);
+ }else{
+ return response.set(3);
+ }
+ //鐗╂枡-瀹℃壒鎻愪氦
+ mApprovingList.forEach(cApproving->{
+ cApproving.setCreateDate(new Date());
+ cApproving.setMainId(main.getId());
+ cApproving.setStatus(1);
+ });
+
+ mApprovingService.insert(mApprovingList);
+ return response.set(1);
+ }
+
+ public Response productSoftwareSubmit(MultipartFile file, WorksheetMainDTO2 mainDTO, DocUser user) throws IOException {
+ Response response = new Response();
+ WorksheetMain main = mainDTO.getMain();
+ ProductSoftwareApproving approving = mainDTO.getApproving();
+ //棣栧厛鏍￠獙鏂囦欢鍚嶆槸鍚﹀凡瀛樺湪
+ String filename = file.getOriginalFilename();
+ List<ProductSoftwareApproving> softwareApprovingList = psaService.getAll();
+ List<ProductSoftware> softwareList = productSoftwareService.getAll();
+ List<String> existApprovingList = softwareApprovingList.stream().map(ProductSoftwareApproving::getSoftwareName).collect(Collectors.toList());
+ List<String> existList = softwareList.stream().map(ProductSoftware::getSoftwareName).collect(Collectors.toList());
+
+ for (String existFilename:existList){
+ if(filename.equals(existFilename)){
+ return response.set(1,false,"杞欢鏂囦欢鍚嶅凡瀛樺湪");
+ }
+ }
+ for (String existFilename:existApprovingList){
+ if(filename.equals(existFilename)){
+ return response.set(1,false,"杞欢鏂囦欢鍚嶅湪瀹℃壒鍒楄〃涓凡瀛樺湪");
+ }
+ }
+
+ main.setType(1);
+ //鎻愪氦涓昏〃
+ main.setCreateUserId(user.getId());
+ //鎻愪氦浜鸿鑹叉潵鍒ゆ柇宸ヤ綔娴佸眰绾�
+ if(user.getRoleId().equals("1001")){
+ if(main.getId()==null) {
+ main.setLevel(2);
+ main.setStatus(1);
+ mainMapper.insert(main);
+ }
+ //鎻愪氦瀛愯〃
+ WorksheetLink link =new WorksheetLink();
+ link.setMainId(main.getId());
+ link.setParentId(0);
+ link.setDealUserId(main.getNextUser());
+ link.setDealType(1);
+ link.setDealDesc(main.getDealDesc());
+ link.setLinkStatus(0);
+ link.setEnableArchive(0);
+ linkMapper.insert(link);
+ }
+ else if(user.getRoleId().equals("1002")){
+ if(main.getId()==null) {
+ main.setLevel(1);
+ main.setStatus(2);
+ mainMapper.insert(main);
+ }
+ //鎻愪氦瀛愯〃
+ WorksheetLink link =new WorksheetLink();
+ link.setMainId(main.getId());
+ link.setParentId(0);
+ link.setDealUserId(main.getNextUser());
+ link.setDealType(2);
+ link.setDealDesc(main.getDealDesc());
+ link.setLinkStatus(0);
+ link.setEnableArchive(1);
+ linkMapper.insert(link);
+ }
+ else if(user.getRoleId().equals("1003")){
+ main.setLevel(0);
+ main.setStatus(5);
+ mainMapper.insert(main);
+ }else{
+ return response.set(1,false,"瑙掕壊鏃犳硶鎻愪氦瀹℃壒");
+ }
+ //杞寲涓哄鎵硅矾寰�
+ //妫�鏌ユ槸鍚︿负zip
+ boolean isZip = Zip4jUtil.checkZipFileParam(file);
+ if(!isZip){
+ return response.set(1,false,"涓婁紶鐨勬枃浠舵牸寮忎笉鏄痾ip");
+ }
+ //zip瀛樺偍璺緞:doc_file/product_approving/${username}/{dateFormat}/${timeStamp}
+ String rootFile = CommonUtil.getRootFile();
+ String dateFormat = new SimpleDateFormat("YYYY-MM").format(new Date());
+ long timeStamp = System.currentTimeMillis();
+ String productSoftwarePath = File.separator + "product_software" + File.separator + user.getName() + File.separator + dateFormat+ File.separator + timeStamp;
+ String filePath = rootFile + productSoftwarePath;
+ String originalFilename = file.getOriginalFilename();
+ File zipFile = new File(filePath+File.separator+ originalFilename);
+ if(!zipFile.exists()){
+ zipFile.mkdirs();
+ }
+ file.transferTo(zipFile);
+ approving.setSoftwareUrl("doc_file"+productSoftwarePath+File.separator+ originalFilename);
+ approving.setSoftwareName(originalFilename);
+ approving.setCreateTime(new Date());
+ approving.setMainId(main.getId());
+ //浜у搧杞欢鎻愪氦
+ psaService.insert(approving);
+ return response.set(1,true, "鎻愪氦瀹屾垚");
}
public WorksheetMain getInfoById(Integer id) {
@@ -106,6 +510,7 @@
main.setId(id);
main.setStatus(status);
main.setEndReason(endReason);
+ main.setEndTime(new Date());
mainMapper.updateById(main);
}
@@ -228,19 +633,39 @@
}
break;
}
+ //鏌ヨ鎴戠殑宸ュ崟鏁伴噺
+ QueryWrapper<WorksheetMain> query = Wrappers.query();
+ query.eq("create_user_id",user.getId());
+ Integer count = mainMapper.selectCount(query);
+ map.put("my",count);
return map;
}
public WorksheetMain getLinkList(int id) {
- return mainMapper.getLinkList(id);
+ //鍒ゆ柇鏄摢绉嶇被鍨嬬殑瀹℃壒,杩斿洖涓嶅悓鐨勭被鍨� 鍏蜂綋鏁版嵁
+ Integer type = getInfoById(id).getType();
+ if(type.intValue() == EnumWorksheetType.ProductBom.getType()) {
+ WorksheetMain main = mainMapper.getLinkList(id);
+ List<ProductBomApproving> pbaList = approvingService.getList(main.getProductApproving().getId());
+ main.getProductApproving().setBomApprovingList(pbaList);
+ return main;
+ }else if(type.intValue() == EnumWorksheetType.Material.getType()){
+ return mainMapper.getLinkListWithMaterials(id);
+ }else{ //鐗╂枡-浜у搧
+ return mainMapper.getLinkListWithMaterialProducts(id);
+ }
}
public Response<PageInfo<WorksheetMain>> getApprovingListPage(DocUser user, int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
QueryWrapper<WorksheetMain> query = Wrappers.query();
- query.eq("create_user_id",user.getId()).in("status",1,2);
+ query.eq("create_user_id",user.getId()).in("status",1,2).orderByDesc("id");
List<WorksheetMain> worksheetMainList = mainMapper.selectList(query);
+ //鏌ヨ涓昏〃鐘舵�佸搴旂殑瀛愯〃
+ worksheetMainList.forEach(main -> {
+ main.setApprovingUser(linkService.getApprovingUser(main.getId()));
+ });
PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
}
@@ -248,7 +673,7 @@
public Response<PageInfo<WorksheetMain>> getRejectedListPage(DocUser user, int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
QueryWrapper<WorksheetMain> query = Wrappers.query();
- query.eq("create_user_id",user.getId()).in("status",0);
+ query.eq("create_user_id",user.getId()).in("status",0).orderByDesc("id");
List<WorksheetMain> worksheetMainList = mainMapper.selectList(query);
PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
@@ -261,7 +686,7 @@
//鑷繁鐨勫伐鍗�
if(!user.getRoleId().equals("1003")){
QueryWrapper<WorksheetMain> query = Wrappers.query();
- query.eq("create_user_id",user.getId()).in("status",5);
+ query.eq("create_user_id",user.getId()).in("status",5).orderByDesc("id");
worksheetMainList = mainMapper.selectList(query);
}else{
@@ -274,15 +699,30 @@
public Response<PageInfo<WorksheetMain>> getHandlingListPage(DocUser user, int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
- List<WorksheetMain> worksheetMainList = linkService.getInfoList2(user.getId(),0);
+ List<WorksheetMain> worksheetMainList = linkService.getInfoList3(user.getId(),0);
PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
}
public Response<PageInfo<WorksheetMain>> getHandledListPage(DocUser user, int pageNum, int pageSize) {
PageHelper.startPage(pageNum,pageSize);
- List<WorksheetMain> worksheetMainList = linkService.getInfoList2(user.getId(),1);
+ List<WorksheetMain> worksheetMainList = linkService.getInfoList3(user.getId(),1);
PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
}
+
+ public WorksheetMain getInfo(int id) {
+ return mainMapper.selectById(id);
+ }
+
+ public Response<PageInfo<WorksheetMain>> getMyList(int pageNum, int pageSize, DocUser user) {
+ PageHelper.startPage(pageNum,pageSize);
+ QueryWrapper<WorksheetMain> query = Wrappers.query();
+ query.eq("create_user_id",user.getId()).orderByDesc("id");
+ List<WorksheetMain> worksheetMainList = mainMapper.selectList(query);
+ PageInfo<WorksheetMain> pageInfo = new PageInfo<>(worksheetMainList);
+ return new Response<PageInfo<WorksheetMain>>().set(1,pageInfo);
+
+ }
+
}
--
Gitblit v1.9.1