管控项保存接口

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -270,7 +270,7 @@ public class PointController extends AbstractBaseController {
 
 			for (PointInputItemVo pItemVo : customInputList) {
 				PointInputItem pointInputItem = new PointInputItem();
-				if(pItemVo.getPointItemId()==0l) {
+				if(pItemVo.getPointItemId()== 0L) {
 					pointInputItem.setPointId(pointClassify.getPointId());
 					pointInputItem.setInputItemId(pItemVo.getId());
 					pointInputItem.setClassifyIds(Long.valueOf(newPointClassify.getId()).toString());
@@ -294,7 +294,7 @@ public class PointController extends AbstractBaseController {
 						}
 					}
 				}else {
-					if (!collect.contains(pItemVo.getPointItemId())) {
+					if (collect.contains(pItemVo.getPointItemId())) {
 						pointInputItem.setId(pItemVo.getPointItemId());
 						pointInputItem.setInputItemId(pItemVo.getId());
 						pointInputItem.setPointId(pointClassify.getPointId());

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/application-dev.properties

@@ -20,7 +20,7 @@ ribbon.MaxAutoRetries = 1
 xiy_amos_satety_business
 spring.reactor.debug-agent.enabled=true
 #DB properties:
-spring.datasource.url=jdbc:vastbase://36.46.137.116:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true&stringtype=unspecified
+spring.datasource.url=jdbc:vastbase://36.46.137.116:5432/tzs_amos_tzs_biz_init?currentSchema=amos_tzs_biz&allowMultiQueries=true
 spring.datasource.username=admin
 spring.datasource.password=Yeejoin@2023
 spring.datasource.driver-class-name = cn.com.vastbase.Driver

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/resources/db/mapper/dbTemplate_input_item.xml

@@ -198,6 +198,7 @@
 		LEFT JOIN p_input_item pii ON pii.id = ppi.input_item_id
 		WHERE pii.is_delete = '0'
 		<if test="classifyId!=null and classifyId !='' "> AND ppi.classify_ids = #{classifyId}</if>
+		ORDER BY pOrderNo
 	</select>
 	<select id="getInputItemListByitemNos" resultType="com.yeejoin.amos.patrol.business.vo.InputItemVo">
 		SELECT