From 52b3796bfe8d797e038a3af5f447d4832f9745e8 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 17 十月 2024 11:28:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java | 154 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 138 insertions(+), 16 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
index 24ad6b7..e271b30 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSamplingController.java
@@ -6,31 +6,34 @@
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Resource;
+import javax.servlet.ServletSecurityElement;
import javax.servlet.http.HttpServletResponse;
import javax.swing.plaf.basic.BasicScrollPaneUI;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.framework.config.MatchUtils;
-import com.ltkj.hosp.domain.TbTransition;
-import com.ltkj.hosp.domain.TjCustomer;
-import com.ltkj.hosp.domain.TjProject;
-import com.ltkj.hosp.service.ITjCustomerService;
-import com.ltkj.hosp.service.ITjProjectService;
-import com.ltkj.hosp.service.TjAsyncService;
+import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.service.*;
+import com.ltkj.web.controller.lis.LisApiMethod;
+import com.sun.xml.internal.bind.v2.TODO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.aspectj.weaver.AjAttribute;
+import org.springframework.beans.BeanUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.enums.BusinessType;
-import com.ltkj.hosp.domain.TjSampling;
-import com.ltkj.hosp.service.ITjSamplingService;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.common.core.page.TableDataInfo;
@@ -42,7 +45,7 @@
*/
@RestController
@RequestMapping("/sampling/sampling")
-@Api(tags = "浣撴閲囨牱绠＄悊")
+@Api(tags = "PC绔� 浣撴閲囨牱绠＄悊")
public class TjSamplingController extends BaseController {
@Resource
private ITjSamplingService tjSamplingService;
@@ -54,11 +57,17 @@
private TjAsyncService asyncService;
@Resource
private RedisCache redisCache;
+ @Autowired
+ private ITjOrderService orderService;
+ @Autowired
+ private ITbTransitionService tbTransitionService;
+ @Autowired
+ private LisApiMethod lisApiMethod;
/**
* 鏌ヨ浣撴閲囨牱绠＄悊鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('sampling:sampling:list')")
+ //@PreAuthorize("@ss.hasPermi('sampling:sampling:list')")
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ浣撴閲囨牱绠＄悊鍒楄〃(鑷甫榛樿)")
public TableDataInfo list(TjSampling tjSampling) {
@@ -178,9 +187,117 @@
}
/**
+ * 鑾峰彇閲囨牱瀹㈡埛鍒楄〃
+ * @param isSignFor
+ * @param tjNum
+ * @param name
+ * @param pageNum
+ * @param pageSize
+ * @param beginTime
+ * @param endTime
+ * @return
+ */
+ @GetMapping("/getCusList")
+ @ApiOperation(value = "鑾峰彇閲囨牱瀹㈡埛鍒楄〃")
+ public AjaxResult getCusList(@RequestParam(defaultValue = "1") @ApiParam(value = "0鏄�1鍚�") Integer isSignFor,
+ @RequestParam(required = false) @ApiParam(value = "浣撴鍙�") String tjNum,
+ @RequestParam(required = false) @ApiParam(value = "瀹㈡埛濮撳悕") String name,
+ @ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer pageNum,
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @ApiParam(value = "寮�濮嬫椂闂�") @RequestParam(required = false) String beginTime,
+ @ApiParam(value = "缁撴潫鏃堕棿") @RequestParam(required = false) String endTime){
+ Page<TjSampling> samplingPage = new Page<>(pageNum, pageSize);
+ LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjSampling::getIsSignFor,isSignFor);
+ if (null != tjNum && StrUtil.isNotBlank(tjNum))
+ wrapper.eq(TjSampling::getTjNum,tjNum);
+ if (null != name && StrUtil.isNotBlank(name))
+ wrapper.eq(TjSampling::getCusName,name);
+ if (null != beginTime && null != endTime && StrUtil.isNotBlank(beginTime) && StrUtil.isNotBlank(endTime))
+ wrapper.between(TjSampling::getApplicationTime, beginTime, endTime);
+ wrapper.groupBy(TjSampling::getCusId);
+// wrapper.last("LIMIT " + (pageNum - 1) * pageSize + "," + pageSize);
+ Page<TjSampling> page = tjSamplingService.page(samplingPage, wrapper);
+ List<TjSampling> list = page.getRecords();
+ ArrayList<TjCustomer> tjCustomers = new ArrayList<>();
+ for (TjSampling tjSampling : list) {
+ TjCustomer customer = customerService.getById(tjSampling.getCusId());
+ customer.setCusName(MatchUtils.hideCusName(customer.getCusName()));
+ customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
+ customer.setTjNumber(tjSampling.getTjNum());
+ customer.setApplicationTime(tjSampling.getApplicationTime());
+ tjCustomers.add(customer);
+ }
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("list",tjCustomers);
+ hashMap.put("total",page.getTotal());
+ return AjaxResult.success(hashMap);
+ }
+
+ /**
+ * 鏍规嵁瀹㈡埛鑾峰彇閲囨牱鍒楄〃
+ * @param cusId
+ * @return
+ */
+ @GetMapping("/getCusCyList")
+ @ApiOperation(value = "鏍规嵁瀹㈡埛鑾峰彇閲囨牱鍒楄〃")
+ public AjaxResult getCusCyList(@RequestParam @ApiParam(value = "瀹㈡埛id") String cusId){
+ if (cusId == null || StrUtil.isBlank(cusId))
+ return AjaxResult.error("鍙傛暟閿欒");
+ LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(TjSampling::getCusId,cusId);
+ wrapper.isNull(TjSampling::getParentId);
+ List<TjSampling> list = tjSamplingService.list(wrapper);
+ if (list.isEmpty())
+ return AjaxResult.error("鍙傛暟閿欒");
+ for (TjSampling sampling : list) {
+ sampling.setCusName(MatchUtils.hideCusName(sampling.getCusName()));
+ }
+ return AjaxResult.success(list);
+ }
+
+ @GetMapping("/mergeCaiYang")
+ @ApiOperation(value = "閲囨牱鐧昏鍚堝苟椤圭洰鎺ュ彛")
+ public AjaxResult mergeCaiYang(@RequestParam List<String> ids){
+ if(null !=ids && !ids.isEmpty()){
+ int i = tjSamplingService.panduanshifoukeyihebing(ids);
+ if(i>1){
+ return AjaxResult.error("鏍囨湰绫诲瀷涓嶄竴鑷�,涓嶅彲鍚堝苟");
+ }
+
+ TjSampling tjSampling = tjSamplingService.getById(ids.get(0));
+
+
+ //todo 鍔犱竴鏉″垽鏂槸鍚﹀瓨鍦ㄥ悎骞堕」鐩殑鏌ヨsql
+ //todo 鍒ゆ柇浼犲叆鐨勯」鐩槸鍚﹀瓨鍦ㄥ悎骞堕」鐩� 涓嶅瓨鍦ㄨ蛋鍘熼�昏緫 瀛樺湪璧癳lse
+
+
+ Map<String,Object> map= tjSamplingService.hebingCaiYangInFo(ids);
+ TjSampling sampling=new TjSampling();
+ String proId = map.get("proId").toString();
+ String proName = map.get("proName").toString();
+ BeanUtil.copyProperties(tjSampling,sampling,new String[]{"id"});
+ sampling.setProId(proId);
+ sampling.setProName(proName);
+ sampling.setIsMerge(1);
+ if (tjSamplingService.save(sampling)) {
+ for (String id : ids) {
+ TjSampling service = tjSamplingService.getById(id);
+ service.setParentId(sampling.getId());
+ service.setIsMerge(1);
+ tjSamplingService.updateById(service);
+ }
+ return AjaxResult.success("鍚堝苟椤圭洰鎴愬姛!");
+ }
+ }
+ return AjaxResult.error("璇烽�夋嫨浣犺鍚堝苟鐨勯」鐩�!!!");
+ }
+
+ /**
* 瀵煎嚭浣撴閲囨牱绠＄悊鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('sampling:sampling:export')")
+ //@PreAuthorize("@ss.hasPermi('sampling:sampling:export')")
@Log(title = "浣撴閲囨牱绠＄悊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
@ApiOperation(value = "瀵煎嚭浣撴閲囨牱绠＄悊鍒楄〃")
@@ -193,7 +310,7 @@
/**
* 鑾峰彇浣撴閲囨牱绠＄悊璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('sampling:sampling:query')")
+ //@PreAuthorize("@ss.hasPermi('sampling:sampling:query')")
@GetMapping(value = "/{id}")
@ApiOperation(value = "鑾峰彇浣撴閲囨牱绠＄悊璇︾粏淇℃伅")
public AjaxResult getInfo(@PathVariable("id") String id) {
@@ -203,7 +320,7 @@
/**
* 鏂板浣撴閲囨牱绠＄悊
*/
- @PreAuthorize("@ss.hasPermi('sampling:sampling:add')")
+ //@PreAuthorize("@ss.hasPermi('sampling:sampling:add')")
@Log(title = "浣撴閲囨牱绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
@ApiOperation(value = "鏂板浣撴閲囨牱绠＄悊")
@@ -214,7 +331,7 @@
/**
* 淇敼浣撴閲囨牱绠＄悊
*/
- @PreAuthorize("@ss.hasPermi('sampling:sampling:edit')")
+ //@PreAuthorize("@ss.hasPermi('sampling:sampling:edit')")
@Log(title = "浣撴閲囨牱绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
@ApiOperation(value = "淇敼浣撴閲囨牱绠＄悊")
@@ -225,7 +342,7 @@
/**
* 鍒犻櫎浣撴閲囨牱绠＄悊
*/
- @PreAuthorize("@ss.hasPermi('sampling:sampling:remove')")
+ //@PreAuthorize("@ss.hasPermi('sampling:sampling:remove')")
@Log(title = "浣撴閲囨牱绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
@ApiOperation(value = "鍒犻櫎浣撴閲囨牱绠＄悊")
@@ -239,6 +356,7 @@
*/
@PostMapping("/confirmSampling")
@ApiOperation(value = "纭閲囨牱鎺ュ彛")
+ @Transactional
public AjaxResult confirmSampling(@RequestBody List<String> ids) {
if (null == ids || ids.size() == 0) {
return AjaxResult.error("璇烽�夋嫨瑕佺‘璁ら」");
@@ -266,8 +384,12 @@
}
}
}
- tjSamplingService.updateById(sampling);
+ if (!tjSamplingService.updateById(sampling)) {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎿嶄綔澶辫触,璇烽噸璇�");
+ }
}
+
return AjaxResult.success("鎿嶄綔鎴愬姛");
}
}
--
Gitblit v1.8.0