end7less
/
program_xm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2.0

master
陈裕财 2 years ago
parent
cc3b8a1041
commit
ccef6ae506
4 changed files with 4 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java
  2. 3
      xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java
  3. 3
      xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java
  4. 2
      xm-core/src/main/java/com/xm/core/service/XmTaskService.java

3
xm-core/src/main/java/com/xm/core/ctrl/XmFuncController.java
View File

@ -10,7 +10,6 @@ import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils; import com.mdp.safe.client.utils.LoginUtils;
import com.mdp.sensitive.SensitiveWordService; import com.mdp.sensitive.SensitiveWordService;
import com.mdp.swagger.ApiEntityParams; import com.mdp.swagger.ApiEntityParams;
import com.xm.core.entity.XmBranchStateHis;
import com.xm.core.entity.XmFunc; import com.xm.core.entity.XmFunc;
import com.xm.core.entity.XmProduct; import com.xm.core.entity.XmProduct;
import com.xm.core.service.XmFuncService; import com.xm.core.service.XmFuncService;
@ -76,7 +75,7 @@ public class XmFuncController {
RequestUtils.transformArray(params, "ids"); RequestUtils.transformArray(params, "ids");
IPage page=QueryTools.initPage(params); IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmFunc> qw = QueryTools.initQueryWrapper(XmFunc.class , params);
List<Map<String,Object>> datas = xmFuncService.selectListMapByWhere(page,qw,params); List<Map<String,Object>> datas = xmFuncService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmFunc列表 return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmFunc列表

3
xm-core/src/main/java/com/xm/core/ctrl/XmRecordVisitController.java
View File

@ -8,7 +8,6 @@ import com.mdp.core.utils.RequestUtils;
import com.mdp.safe.client.entity.User; import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils; import com.mdp.safe.client.utils.LoginUtils;
import com.mdp.swagger.ApiEntityParams; import com.mdp.swagger.ApiEntityParams;
import com.xm.core.entity.XmBranchStateHis;
import com.xm.core.entity.XmRecordVisit; import com.xm.core.entity.XmRecordVisit;
import com.xm.core.service.XmRecordVisitService; import com.xm.core.service.XmRecordVisitService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
@ -67,7 +66,7 @@ public class XmRecordVisitController {
RequestUtils.transformArray(params, "ids"); RequestUtils.transformArray(params, "ids");
IPage page=QueryTools.initPage(params); IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmRecordVisit> qw = QueryTools.initQueryWrapper(XmRecordVisit.class , params);
List<Map<String,Object>> datas = xmRecordVisitService.selectListMapByWhere(page,qw,params); List<Map<String,Object>> datas = xmRecordVisitService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmRecordVisit列表 return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmRecordVisit列表

3
xm-core/src/main/java/com/xm/core/ctrl/XmTestCasedbController.java
View File

@ -9,7 +9,6 @@ import com.mdp.core.utils.RequestUtils;
import com.mdp.safe.client.entity.User; import com.mdp.safe.client.entity.User;
import com.mdp.safe.client.utils.LoginUtils; import com.mdp.safe.client.utils.LoginUtils;
import com.mdp.swagger.ApiEntityParams; import com.mdp.swagger.ApiEntityParams;
import com.xm.core.entity.XmBranchStateHis;
import com.xm.core.entity.XmProduct; import com.xm.core.entity.XmProduct;
import com.xm.core.entity.XmTestCasedb; import com.xm.core.entity.XmTestCasedb;
import com.xm.core.service.XmGroupService; import com.xm.core.service.XmGroupService;
@ -77,7 +76,7 @@ public class XmTestCasedbController {
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
params.put("pbranchId",user.getBranchId()); params.put("pbranchId",user.getBranchId());
IPage page=QueryTools.initPage(params); IPage page=QueryTools.initPage(params);
QueryWrapper<XmBranchStateHis> qw = QueryTools.initQueryWrapper(XmBranchStateHis.class , params);
QueryWrapper<XmTestCasedb> qw = QueryTools.initQueryWrapper(XmTestCasedb.class , params);
List<Map<String,Object>> datas = xmTestCasedbService.selectListMapByWhere(page,qw,params); List<Map<String,Object>> datas = xmTestCasedbService.selectListMapByWhere(page,qw,params);
return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTestCasedb列表 return Result.ok("query-ok","查询成功").setData(datas).setTotal(page.getTotal()); //列出XmTestCasedb列表

2
xm-core/src/main/java/com/xm/core/service/XmTaskService.java
View File

@ -785,7 +785,7 @@ public class XmTaskService extends BaseService<XmTaskMapper,XmTask> {
public List<XmTask> listTenTaskByProjectIdAndProductId(String projectId,String productId) { public List<XmTask> listTenTaskByProjectIdAndProductId(String projectId,String productId) {
return baseMapper.listTenTaskByProjectIdAndProductId(map("projectId", projectId, productId));
return baseMapper.listTenTaskByProjectIdAndProductId(map("projectId", projectId, "productId",productId));
} }

Write Preview
Loading…
Cancel
Save