|
@@ -1,5 +1,6 @@
|
1
|
1
|
package com.liang.controller;
|
2
|
2
|
|
|
3
|
+import com.fasterxml.jackson.databind.ObjectMapper;
|
3
|
4
|
import com.github.pagehelper.PageHelper;
|
4
|
5
|
import com.github.pagehelper.PageInfo;
|
5
|
6
|
import com.liang.common.JsonTool;
|
|
@@ -17,6 +18,7 @@ import org.springframework.ui.Model;
|
17
|
18
|
import org.springframework.web.bind.annotation.*;
|
18
|
19
|
|
19
|
20
|
import javax.annotation.Resource;
|
|
21
|
+import java.sql.Date;
|
20
|
22
|
import java.util.HashMap;
|
21
|
23
|
import java.util.List;
|
22
|
24
|
import java.util.Map;
|
|
@@ -48,6 +50,8 @@ public class PrjContractController extends BaseController {
|
48
|
50
|
|
49
|
51
|
@Resource
|
50
|
52
|
private BasePersonService basePersonService;
|
|
53
|
+ @Resource
|
|
54
|
+ private PrjPayplanService prjPayplanService;
|
51
|
55
|
|
52
|
56
|
|
53
|
57
|
/**
|
|
@@ -207,7 +211,9 @@ public class PrjContractController extends BaseController {
|
207
|
211
|
public String forUpdate(Model model, @PathVariable Integer id) {
|
208
|
212
|
//当前项目
|
209
|
213
|
PrjContract contract = prjContractService.queryById(id);
|
|
214
|
+ List<PrjPayplan> payPlanList = prjPayplanService.getPayPlanList(id);
|
210
|
215
|
String userPostName = getSysUserInfo().getUserPostName();
|
|
216
|
+ model.addAttribute("dataFkjh",payPlanList);
|
211
|
217
|
model.addAttribute("contract", contract);
|
212
|
218
|
model.addAttribute("userPostName",userPostName);
|
213
|
219
|
|
|
@@ -388,7 +394,6 @@ public class PrjContractController extends BaseController {
|
388
|
394
|
* 获取创建人
|
389
|
395
|
* @param pageNum
|
390
|
396
|
* @param pageSize
|
391
|
|
- * @param cjr
|
392
|
397
|
* @return
|
393
|
398
|
*/
|
394
|
399
|
@ResponseBody
|
|
@@ -431,5 +436,31 @@ public class PrjContractController extends BaseController {
|
431
|
436
|
}
|
432
|
437
|
return BaseResult.success(num);
|
433
|
438
|
}
|
|
439
|
+
|
|
440
|
+ @ResponseBody
|
|
441
|
+ @RequestMapping(value = "/getAll/{fromdata}",method = RequestMethod.POST)
|
|
442
|
+ public BaseResult getAll(@PathVariable(required = false) String fromdata) throws Exception{
|
|
443
|
+ Map<String, Object> paraMap = new HashMap<>();
|
|
444
|
+ ObjectMapper objectMapper = new ObjectMapper();
|
|
445
|
+ PrjContract formDatas = objectMapper.readValue(fromdata, PrjContract.class);
|
|
446
|
+ Date kssj = formDatas.getKssj();
|
|
447
|
+ Date jssj = formDatas.getJssj();
|
|
448
|
+ paraMap.put("htmc", formDatas.getHtmc());
|
|
449
|
+ paraMap.put("rws", formDatas.getRws());
|
|
450
|
+ paraMap.put("rwsmc", formDatas.getRwsmc());
|
|
451
|
+ paraMap.put("cjr",formDatas.getCjr());
|
|
452
|
+ paraMap.put("erpbh",formDatas.getErpbh());
|
|
453
|
+ paraMap.put("spzt",formDatas.getSpzt());
|
|
454
|
+ if (kssj != null) {
|
|
455
|
+ paraMap.put("kssj", formDatas.getKssj().toString());
|
|
456
|
+ }
|
|
457
|
+ if (jssj !=null) {
|
|
458
|
+ paraMap.put("jssj", formDatas.getJssj().toString());
|
|
459
|
+ }
|
|
460
|
+ List<PrjContract> list = prjContractService.getContractList(paraMap);
|
|
461
|
+ return BaseResult.success("导出成功",list);
|
|
462
|
+
|
|
463
|
+ }
|
|
464
|
+
|
434
|
465
|
}
|
435
|
466
|
|