优选物料修改

src/main/java/com/jeeplus/modules/sg/balancedlibrary/materialReportDetails/utils/ExcelUtil.java

@@ -14,6 +14,7 @@ import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.constant.Are
 import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.constant.MaterialsUnitFlagEnum;
 import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.entity.MaterialReportDetails;
 import com.jeeplus.modules.sg.balancedlibrary.onPassageMaterials.entity.MaterialInformation;
+import com.jeeplus.modules.sg.balancedlibrary.preferredMaterials.entity.PreferredMaterials;
 import com.jeeplus.modules.sg.balancedlibrary.reportPerson.entity.ReportPerson;
 import com.jeeplus.modules.sg.balancedlibrary.standardMaterials.entity.StandardMaterials;
 import com.jeeplus.modules.sg.balancedlibrary.transitMaterialGoods.entity.TransitMaterialGoods;
@@ -469,7 +470,7 @@ public class ExcelUtil {
 	 * @param preferredCodes
 	 * @param quotaList
 	 */
-	public void dealVerify(List<StandardMaterials> standardList, List<String> preferredCodes,
+	public void dealVerify(List<StandardMaterials> standardList, List<PreferredMaterials> preferredCodes,
 						   List<MaterialQuota> quotaList) throws Exception {
 		Map<String,StandardMaterials> standardMap = new HashMap<>();
 		for(StandardMaterials standard:standardList){
@@ -499,11 +500,16 @@ public class ExcelUtil {
 				Cell standardCell = row.createCell(14);
 				standardCell.setCellValue(standardMap.get(materialCode).getPurchaseStandardId());
 				Cell preferredCell = row.createCell(15);
-				if(preferredCodes.contains(materialCode)){
-					preferredCell.setCellValue("优选");
-				}else{
-					preferredCell.setCellValue("非优选");
-				}
+//				if(preferredCodes.contains(materialCode)){
+//					preferredCell.setCellValue("优选");
+//				}else{
+//					preferredCell.setCellValue("非优选");
+//				}
+				preferredCodes.forEach(pre->{
+					if (pre.getMaterialCode().equals(materialCode)){
+						preferredCell.setCellValue(pre.getThirdClassList());
+					}
+				});
 				Cell quotaCell = row.createCell(16);
 				Double number = row.getCell(7).getNumericCellValue();//物资需求数量
 				MaterialQuota quota = quotaMap.get(materialCode);
@@ -896,7 +902,7 @@ public class ExcelUtil {
 	 * @param preferredCodes
 	 * @param quotaList
 	 */
-	public void dealVerifyZt(List<StandardMaterials> standardList, List<String> preferredCodes,
+	public void dealVerifyZt(List<StandardMaterials> standardList, List<PreferredMaterials> preferredCodes,
 							 List<MaterialQuota> quotaList, List<TransitMaterialGoods> goodsList,
 							 List<MaterialInformation> materList, Map<String, String> reportPersonMap){
 		Map<String,StandardMaterials> standardMap = new HashMap<>();
@@ -1003,11 +1009,16 @@ public class ExcelUtil {
 				Cell standardCell = row.createCell(14);
 				standardCell.setCellValue(standardMap.get(materialCode).getPurchaseStandardId());
 				Cell preferredCell = row.createCell(15);
-				if(preferredCodes.contains(materialCode)){
-					preferredCell.setCellValue("优选");
-				}else{
-					preferredCell.setCellValue("非优选");
-				}
+//				if(preferredCodes.contains(materialCode)){
+//					preferredCell.setCellValue("优选");
+//				}else{
+//					preferredCell.setCellValue("非优选");
+//				}
+				preferredCodes.forEach(pre->{
+					if (pre.getMaterialCode().equals(materialCode)){
+						preferredCell.setCellValue(pre.getThirdClassList());
+					}
+				});
 				Cell quotaCell = row.createCell(16);
 				Double number = row.getCell(7).getNumericCellValue();//物资需求数量
 				MaterialQuota quota = quotaMap.get(materialCode);

src/main/java/com/jeeplus/modules/sg/balancedlibrary/materialReportDetails/utils/ExportUtil.java

@@ -48,7 +48,7 @@ public class ExportUtil {
      * @param response
      */
     public void exportDetails(HttpServletResponse response, List<MaterialReportDetails> reportList, List<LikuDetail> likuList,
-                              List<StandardMaterials> standardList,List<String> preferredCodes,
+                              List<StandardMaterials> standardList,List<PreferredMaterials> preferredCodes,
                               List<MaterialQuota> quotaList,List<TransitMaterialGoods> goodsList,
                               Map<String, String> reportPersonMap,List<PreferredMaterials> materialsList,
                               List<LiKuResourcePool> poolList){
@@ -276,15 +276,25 @@ public class ExportUtil {
                     if (materials != null){
                         cell18.setCellValue(preferMap.get(report.getMaterialCode()).getArea());
                     }
-                    if (StringUtils.isNotEmpty(cell15.getStringCellValue())){
-                        if (preferredCodes.contains(report.getMaterialCode())){
-                            cell19.setCellValue("优选");
-                        }else {
-                            cell19.setCellValue("非优选");
+//                    if (StringUtils.isNotEmpty(cell15.getStringCellValue())){
+//                        if (preferredCodes.contains(report.getMaterialCode())){
+//                            cell19.setCellValue("优选");
+//                        }else {
+//                            cell19.setCellValue("非优选");
+//                        }
+//                    }else {
+//                        cell19.setCellValue("");
+//                    }
+                    preferredCodes.forEach(pre->{
+                        if (pre.getMaterialCode().equals(report.getMaterialCode())){
+                            cell19.setCellValue(pre.getThirdClassList());
                         }
-                    }else {
-                        cell19.setCellValue("");
-                    }
+                    });
+//                    if (preferredCodes.contains(report.getMaterialCode())){
+//                        cell19.setCellValue("优选");
+//                    }else {
+//                        cell19.setCellValue("非优选");
+//                    }
 
 //                    cell19.setCellValue(preferMap.get(report.getMaterialCode()).getThirdClassList());
                     //在途说明、审核说明、意见反馈

src/main/java/com/jeeplus/modules/sg/balancedlibrary/materialReportDetails/web/MaterialReportDetailsControllerTest.java

@@ -316,7 +316,7 @@ public class MaterialReportDetailsControllerTest extends BaseController {
 
         //sheet3所需数据
         List<StandardMaterials> standardList = standardMaterialsService.findAllList(new StandardMaterials());
-        List<String> preferredCodes = preferredMaterialsService.findAllCodes();
+        List<PreferredMaterials> preferredCodes = preferredMaterialsService.findCodes();
         List<MaterialQuota> quotaList = materialQuotaService.findAllList(new MaterialQuota());
         //在途物资数据
         List<TransitMaterialGoods> goodsList = goodsService.getAllGoods();
@@ -1085,7 +1085,7 @@ public class MaterialReportDetailsControllerTest extends BaseController {
             ExcelUtil util = new ExcelUtil(file,1,0);
 
             List<StandardMaterials> standardList = standardMaterialsService.findAllList(new StandardMaterials());
-            List<String> preferredCodes = preferredMaterialsService.findAllCodes();
+            List<PreferredMaterials> preferredCodes = preferredMaterialsService.findCodes();
             List<MaterialQuota> quotaList = materialQuotaService.findAllList(new MaterialQuota());
             util.dealVerify(standardList,preferredCodes,quotaList);
 

src/main/java/com/jeeplus/modules/sg/balancedlibrary/preferredMaterials/mapper/PreferredMaterialsMapper.java

@@ -34,7 +34,17 @@ public interface PreferredMaterialsMapper extends BaseMapper<PreferredMaterials>
      */
     void delList(@Param("list") List<String> list);
 
-    List<String> findAllCodes();
+    /**
+     * 获取物料编码及三级物料清单
+     * @return
+     */
+//    List<String> findAllCodes();
+
+    /**
+     * 获取物料编码及三级物料清单
+     * @return
+     */
+    List<PreferredMaterials> findCodes();
 
     List<PreferredMaterials> findAllMater();
 }

src/main/java/com/jeeplus/modules/sg/balancedlibrary/preferredMaterials/mapper/xml/PreferredMaterialsMapper.xml

@@ -50,7 +50,7 @@
 		</choose>
 	</select>
 
-	<select id="findAllCodes" resultType="String" >
+	<select id="findAllCodes" resultType="java.lang.String" >
 		SELECT
 			a.material_code
 		FROM bla_preferred_materials a
@@ -64,6 +64,17 @@
 			resultType="com.jeeplus.modules.sg.balancedlibrary.preferredMaterials.entity.PreferredMaterials">
 		SELECT material_code,area,third_class_list FROM `bla_preferred_materials`
 	</select>
+	<select id="findCodes"
+			resultType="com.jeeplus.modules.sg.balancedlibrary.preferredMaterials.entity.PreferredMaterials">
+		SELECT
+		a.material_code,
+		a.third_class_list
+		FROM bla_preferred_materials a
+		<where>
+			a.del_flag = '0'
+			${dataScope}
+		</where>
+	</select>
 
 
 	<insert id="insertList">

src/main/java/com/jeeplus/modules/sg/balancedlibrary/preferredMaterials/service/PreferredMaterialsService.java

@@ -77,8 +77,12 @@ public class PreferredMaterialsService extends CrudService<PreferredMaterialsMap
 	}
 
 
-	public List<String> findAllCodes(){
-		return mapper.findAllCodes();
+//	public List<String> findAllCodes(){
+//		return mapper.findAllCodes();
+//	}
+
+	public List<PreferredMaterials> findCodes(){
+		return mapper.findCodes();
 	}
 
 	public List<PreferredMaterials> findAllMater(){

src/main/java/com/jeeplus/modules/sg/balancedlibrary/transitMaterialGoods/web/TransitMaterialGoodsController.java

@@ -14,6 +14,7 @@ import com.jeeplus.modules.sg.balancedlibrary.materialQuota.service.MaterialQuot
 import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.utils.ExcelUtil;
 import com.jeeplus.modules.sg.balancedlibrary.materialReportDetails.utils.ExportUtil;
 import com.jeeplus.modules.sg.balancedlibrary.onPassageMaterials.entity.MaterialInformation;
+import com.jeeplus.modules.sg.balancedlibrary.preferredMaterials.entity.PreferredMaterials;
 import com.jeeplus.modules.sg.balancedlibrary.preferredMaterials.service.PreferredMaterialsService;
 import com.jeeplus.modules.sg.balancedlibrary.reportPerson.service.ReportPersonService;
 import com.jeeplus.modules.sg.balancedlibrary.standardMaterials.entity.StandardMaterials;
@@ -222,7 +223,7 @@ public class TransitMaterialGoodsController extends BaseController {
 //            List<LiKuResourcePool> liKuPoolList = poolService.findLiKuList(null,null);
 //            List<ReportPerson> reportPeople = personService.getDepartmentByPerson();
             List<StandardMaterials> standardList = standardMaterialsService.findAllList(new StandardMaterials());
-            List<String> preferredCodes = preferredMaterialsService.findAllCodes();
+            List<PreferredMaterials> preferredCodes = preferredMaterialsService.findCodes();
             List<MaterialQuota> quotaList = materialQuotaService.findAllList(new MaterialQuota());
             List<TransitMaterialGoods> goodsList = service.getAllGoods();
             util.dealVerifyZt(standardList,preferredCodes,quotaList,goodsList,materList,reportPersonMap);