Merge branch 'bug/master/#160' into 'master'

#261 评标管理新增的本地用户删除失效

See merge request !1

com.gx.obe.service/src/main/java/com/gx/obe/server/management/evaluation/service/impl/BidPriceResultServiceImpl.java

@@ -626,7 +626,7 @@ public class BidPriceResultServiceImpl extends ServiceImpl<BidPriceResultMapper,
 	@Transactional(rollbackFor = Exception.class)
 	public boolean updateBidPriceResultOrSum(BidPriceResult bidPriceResult) {
 		if (updateAssignProperty(bidPriceResult, new String[]{"finalBidPrice", "evaluationPrice", "modifyReason"})) {
-			if (supplierOpeningResultService.updateSupplierSumPrice(bidPriceResult.getTenderId(), bidPriceResult.getSupplierId(), true, true) > 0) {
+			if (supplierOpeningResultService.updateSupplierPrice(bidPriceResult, new String[]{"finalBidPrice", "evaluationPrice", "bidPrice"}) > 0) {
 				return supplierOpeningResultService.updateSumModifyReason(bidPriceResult.getTenderId(), bidPriceResult.getSupplierId());
 			}
 		}

com.gx.obe.service/src/main/java/com/gx/obe/server/management/supplier/dao/SupplierEvaluationResultMapper.java

@@ -24,7 +24,8 @@ public interface SupplierEvaluationResultMapper extends BaseMapper<SupplierEvalu
 
 	Integer updateObeSupplierEvaluationResultBatchList (@Param("ObeSupplierEvaluationResultList")List<SupplierEvaluationResult> ObeSupplierEvaluationResultList);
 	
-	
+	Integer updateUnqObeSupplierEvaluationResultBatchList(@Param("ObeSupplierEvaluationResultList")List<SupplierEvaluationResult> ObeSupplierEvaluationResultList);
+
 	String getCreateSupplierEvaluationResultId(@Param("tenderId")String tenderId,@Param("supplierId") String supplierId);
 	
 	

com.gx.obe.service/src/main/java/com/gx/obe/server/management/supplier/dao/SupplierOpeningResultMapper.java

 package com.gx.obe.server.management.supplier.dao;
 
+import com.gx.obe.server.management.evaluation.entity.BidPriceResult;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -44,6 +45,9 @@ public interface SupplierOpeningResultMapper extends BaseMapper<SupplierOpeningR
      * @return
      */
     Integer updateSupplierSumPrice(@Param("tenderId") String tenderId, @Param("supplierId") String supplierId, @Param("bidPrice") boolean bidPrice, @Param("evalPrice") boolean evalPrice);
+
+
+    Integer updateSupplierPrice(@Param("ObeBidPriceResult") BidPriceResult ObeBidPriceResult, @Param("attributes")String[] attributes);
     
     /**
      * @Description:

com.gx.obe.service/src/main/java/com/gx/obe/server/management/supplier/service/SupplierOpeningResultService.java

@@ -2,6 +2,7 @@ package com.gx.obe.server.management.supplier.service;
 
 import java.util.List;
 
+import com.gx.obe.server.management.evaluation.entity.BidPriceResult;
 import org.apache.ibatis.annotations.Param;
 
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -67,6 +68,9 @@ public interface SupplierOpeningResultService extends IService<SupplierOpeningRe
      * @param evalPrice
      */
     Integer updateSupplierSumPrice(String tenderId, String supplierId, boolean bidPrice, boolean evalPrice);
+
+
+    Integer updateSupplierPrice(BidPriceResult ObeBidPriceResult, String[] attributes);
     
     /**
      * @Description: 获取投标人开标结果

com.gx.obe.service/src/main/java/com/gx/obe/server/management/supplier/service/impl/SupplierEvaluationResultServiceImpl.java

@@ -79,6 +79,7 @@ public class SupplierEvaluationResultServiceImpl extends ServiceImpl<SupplierEva
 		}
 		iCount += insertByBatch(instrtEditPriceItemResultListTemp);
 		iCount += supplierEvaluationResultMapper.updateObeSupplierEvaluationResultBatchList(UpdateeditPriceItemResultListTemp);
+		supplierEvaluationResultMapper.updateUnqObeSupplierEvaluationResultBatchList(UpdateeditPriceItemResultListTemp);
 		return iCount;
 	}
 
@@ -121,7 +122,6 @@ public class SupplierEvaluationResultServiceImpl extends ServiceImpl<SupplierEva
 	 * @Description: 统计初审通过（不通过）的供应商数量
 	 * @author wangxaing
 	 * @param tenderId
-	 * @param type
 	 * @return
 	 */
 	@Override

com.gx.obe.service/src/main/java/com/gx/obe/server/management/supplier/service/impl/SupplierOpeningResultServiceImpl.java

@@ -12,6 +12,7 @@ import com.gx.obe.server.management.evaluation.service.BidPriceResultService;
 import com.gx.obe.server.management.supplier.dao.SupplierOpeningResultMapper;
 import com.gx.obe.server.management.supplier.entity.SupplierOpeningResult;
 import com.gx.obe.server.management.supplier.service.SupplierOpeningResultService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -126,6 +127,11 @@ public class SupplierOpeningResultServiceImpl extends ServiceImpl<SupplierOpenin
 		return supplierOpeningResultMapper.updateSupplierSumPrice(tenderId, supplierId, bidPrice, evalPrice);
 	}
 
+	@Override
+	public Integer updateSupplierPrice(BidPriceResult ObeBidPriceResult,String[] attributes) {
+		return supplierOpeningResultMapper.updateSupplierPrice(ObeBidPriceResult, attributes);
+	}
+
 	/**
 	 * @Description: 获取投标人开标结果
 	 * @author wangxiang

com.gx.obe.service/src/main/resources/mapper/AuthUserMapper.xml

@@ -243,8 +243,8 @@
     
     <!-- 更新用户状态 -->
     <update id="updateUsestatus">
-    	  UPDATE auth_user
-   		  	USE_STATUS = #{useStatus}
+    	UPDATE auth_user
+   		  	SET USE_STATUS = #{useStatus}
 		WHERE	
  			USER_ID = #{id}
     </update>

com.gx.obe.service/src/main/resources/mapper/SupplierEvaluationResultMapper.xml

@@ -88,6 +88,20 @@
 		        </where>
         </foreach>
     </update>
+
+	<update id="updateUnqObeSupplierEvaluationResultBatchList" parameterType="java.util.List">
+		<foreach collection="ObeSupplierEvaluationResultList" item="ObeSupplierEvaluationResult" index="index" open="" close="" separator=";">
+			UPDATE obe_supplier_evaluation_result
+			<set>
+				EVALUATION_OPINION = #{ObeSupplierEvaluationResult.evaluationOpinion} ,
+				BIDDING_REQUEST = #{ObeSupplierEvaluationResult.biddingRequest },
+			</set>
+			<where>
+				EVALUATION_RESULT_ID = #{ObeSupplierEvaluationResult.id}
+				AND ACCESSMENT = '01'
+			</where>
+		</foreach>
+	</update>
     
  	 <!-- 批量插入-->
        <insert id="insertByBatch" parameterType="java.util.List">

com.gx.obe.service/src/main/resources/mapper/SupplierOpeningResultMapper.xml

@@ -286,6 +286,53 @@
     		 AND s.SUPPLIER_ID = #{supplierId}
     	</if>
     </update>
+
+	<update id="updateSupplierPrice">
+		UPDATE OBE_SUPPLIER_OPENING_RESULT
+		<set>
+			<foreach collection="attributes" item="attribute" index="index" open="" close="" separator=",">
+				<if test="attribute == 'priceContent'">
+					PRICE_CONTENT = #{ObeBidPriceResult.priceContent}
+				</if>
+				<if test="attribute == 'currencyCode'">
+					CURRENCY_CODE = #{ObeBidPriceResult.currencyCode}
+				</if>
+				<if test="attribute == 'currencyName'">
+					CURRENCY_NAME = #{ObeBidPriceResult.currencyName}
+				</if>
+				<if test="attribute == 'priceUnit'">
+					PRICE_UNIT = #{ObeBidPriceResult.priceUnit}
+				</if>
+				<if test="attribute == 'finalBidPrice'">
+					FINAL_BID_PRICE = #{ObeBidPriceResult.finalBidPrice}
+				</if>
+				<if test="attribute == 'bidPrice'">
+					BID_PRICE = #{ObeBidPriceResult.bidPrice}
+				</if>
+				<if test="attribute == 'evaluationPrice'">
+					EVALUATION_PRICE = #{ObeBidPriceResult.evaluationPrice}
+				</if>
+				<if test="attribute == 'evaluationPriceOriginal'">
+					EVALUATION_PRICE_ORIGINAL = #{ObeBidPriceResult.evaluationPriceOriginal}
+				</if>
+				<if test="attribute == 'evaluationPriceCorrectRecord'">
+					EVALUATION_PRICE_CORRECT_RECORD = #{ObeBidPriceResult.evaluationPriceCorrectRecord}
+				</if>
+				<if test="attribute == 'modifyReason'">
+					MODIFY_REASON = #{ObeBidPriceResult.modifyReason}
+				</if>
+				<if test="attribute == 'bidPriceName'">
+					BID_PRICE_NAME = #{ObeBidPriceResult.bidPriceName}
+				</if>
+				<if test="attribute == 'createTime'">
+					CREATE_TIME = #{ObeBidPriceResult.createTime}
+				</if>
+			</foreach>
+		</set>
+		WHERE TENDER_ID = #{ObeBidPriceResult.tenderId}
+		AND SUPPLIER_ID = #{ObeBidPriceResult.supplierId}
+
+	</update>
     
     <update id="updateEvaluationPriceAndEvaluationPriceOriginal">
     	UPDATE obe_supplier_opening_result