Explorar el Código

申报要素调整、计划单报错修复

huxy hace 1 semana
padre
commit
4d61f8ad69

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/xml/SyCostLossReviewMapper.xml

@@ -704,10 +704,10 @@ GROUP BY planNo;
         select plan_num as cCode from sy_plan_statistics
         where del_flag = 0
         <if test="e.remarks!=null and e.remarks!=''">
-            and remarks LIKE CONCAT('%',#{remarks},'%')
+            and remarks LIKE CONCAT('%',#{e.remarks},'%')
         </if>
         <if test="e.planMan!=null and e.planMan!=''">
-            and plan_man = #{planMan}
+            and plan_man = #{e.planMan}
         </if>
         <if test='e.readyEndDateB !="" and e.readyEndDateE != null'>
             and ready_end_date between #{e.readyEndDateB} and #{e.readyEndDateE}

+ 1 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -1400,6 +1400,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				result.setSuccess(false);
 				return  result;
 			}
+			syDeclarationElements.setCreateTime(new Date());
 			List<SyDeclarationElementsItem> items = syDeclarationElements.getSyDeclarationElementsItemList();
 			if(items.size()==0){
 				result.setMessage("实体对象子表信息不能为空!");