From dda0aeae41bddb8488d3c4331b1c634479a8871e Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 29 Mar 2022 10:28:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=A4=8D=E5=AE=A1=E5=85=A5=E5=BA=93=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=80=9A=E7=94=A8=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ActSarItemsBussEOService.java | 5 ++++- .../SarBussStandAttrInfoController.java | 15 +++++++++++++++ .../service/ISarBussStandAttrInfoService.java | 3 +++ .../impl/SarBussStandAttrInfoServiceImpl.java | 8 ++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java index 69dd75d1..01758a31 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsBussEOService.java @@ -116,10 +116,13 @@ public class ActSarItemsBussEOService { textStatus = BussEnum.BUSS_YX.getValue(); } + Map attrInfoMap = sarBussStandAttrInfoService.getBussAttrInfo(standId); + String sarStandAttrInfo = JSONObject.toJSONString(attrInfoMap); SarBussionessStand bussionessStand = new SarBussionessStand(); bussionessStand.setId(standId); bussionessStand.setTextStatusBuss(textStatus); - iSarBussionessStandService.updateById(bussionessStand); + bussionessStand.setSarStandAttrEOStr(sarStandAttrInfo); + iSarBussionessStandService.updateSarBussionessStand(bussionessStand); SarBussionessStandState state = new SarBussionessStandState(); state.setStandId(standId); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java index 9a1d426f..6491a480 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java @@ -14,6 +14,7 @@ import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; import java.util.List; +import java.util.Map; import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; @@ -33,6 +34,20 @@ public class SarBussStandAttrInfoController extends BaseController> getBussAttrInfo(String standId) throws Exception { + return Result.success(sarBussStandAttrInfoEOService.getBussAttrInfo(standId)); + } + + @ApiOperation(value = "|SarBussStandAttrInfoEO|单个查询") + @GetMapping("/getSelectFieldValByStandId") +// @RequiresPermissions("lawss:sarBussStandAttrInfo:list") + public ResponseMessage getSelectFieldValByStandId(String field,String standId) throws Exception { + return Result.success(sarBussStandAttrInfoEOService.selectFieldValByStandId(field,standId)); + } + @ApiOperation(value = "|SarBussStandAttrInfoEO|分页查询") @GetMapping("/page") // @RequiresPermissions("lawss:sarBussStandAttrInfo:page") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java index a332d80c..e7c0793b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/ISarBussStandAttrInfoService.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfoEOPage; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; +import java.util.Map; /** *

@@ -16,6 +17,8 @@ import java.util.List; */ public interface ISarBussStandAttrInfoService extends IService { + Map getBussAttrInfo(String standId); + String selectFieldValByStandId(String field,String standId); int updateStandInfo(String standId,String field,String value); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java index d4a5a599..7cb547d0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/service/impl/SarBussStandAttrInfoServiceImpl.java @@ -4,10 +4,12 @@ import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfoEOPage; import com.adc.da.slrs.sarBussStandAttrInfo.service.ISarBussStandAttrInfoService; +import com.adc.da.utils.util.InitStandAttrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Map; /** *

@@ -20,6 +22,12 @@ import java.util.List; @Service public class SarBussStandAttrInfoServiceImpl extends ServiceImpl implements ISarBussStandAttrInfoService { + @Override + public Map getBussAttrInfo(String standId){ + String fieldInfo = InitStandAttrUtil.queryFieldBuss; + return this.baseMapper.selectStandFieldAndData(fieldInfo,standId); + } + @Override public int updateStandInfo(String standId,String field,String value){ return this.baseMapper.updateStandInfo(standId,field,value); From 26b9a7021656ed5f83b736b80b902f70edc466ce Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 29 Mar 2022 10:44:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=B1=9E=E6=80=A7=E6=95=B0=E6=8D=AE=E8=A1=A8?= =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarBussStandAttrInfoController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java index 6491a480..4e4f259b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/controller/SarBussStandAttrInfoController.java @@ -37,8 +37,8 @@ public class SarBussStandAttrInfoController extends BaseController> getBussAttrInfo(String standId) throws Exception { - return Result.success(sarBussStandAttrInfoEOService.getBussAttrInfo(standId)); + public Map getBussAttrInfo(String standId) throws Exception { + return sarBussStandAttrInfoEOService.getBussAttrInfo(standId); } @ApiOperation(value = "|SarBussStandAttrInfoEO|单个查询")