bug修改

src/main/java/com/glxp/api/controller/basic/UdiRelController.java

@@ -138,6 +138,12 @@ public class UdiRelController extends BaseController {
     @PostMapping("udi/basic/rel/update")
     public BaseResponse updateRel(@RequestBody BasicUdiRelRequest basicUdiRelRequest) {
 
+        if (basicUdiRelRequest.getAgengtStartDate() != null && basicUdiRelRequest.getAgengtEndDate() != null) {
+            if (basicUdiRelRequest.getAgengtStartDate().getTime() > basicUdiRelRequest.getAgengtEndDate().getTime()) {
+                return ResultVOUtils.error(999, "代理起始时间不能小于代理截止时间！");
+            }
+        }
+
         BasicUdiRelEntity basicUdiRelEntity = new BasicUdiRelEntity();
         BeanUtils.copyProperties(basicUdiRelRequest, basicUdiRelEntity);
         basicUdiRelEntity.setUpdateTime(new Date());
@@ -150,6 +156,8 @@ public class UdiRelController extends BaseController {
         basicUdiProductEntity.setManufactory(basicUdiRelRequest.getManufactory());
         basicUdiProductEntity.setMeasname(basicUdiRelRequest.getMeasname());
         basicUdiProductEntity.setSpmc(basicUdiRelRequest.getSpmc());
+        basicUdiProductEntity.setMeasname(basicUdiRelRequest.getMeasname());
+        basicUdiProductEntity.setManufactory(basicUdiRelRequest.getManufactory());
         basicUdiProductService.updateByUuid(basicUdiProductEntity);
         return ResultVOUtils.success("添加成功！");
     }

src/main/java/com/glxp/api/res/basic/BasicUdiRelResponse.java

@@ -100,6 +100,8 @@ public class BasicUdiRelResponse {
 
     private Date agengtStartDate;
     private Date agengtEndDate;
+    private String measname;
+    private String manufactory;
 
 
 }

src/main/resources/mybatis/mapper/basic/BasicUdiProductMapper.xml

@@ -12,8 +12,8 @@
             <if test="cpmctymc != '' and cpmctymc != null">
                 AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')
             </if>
-            <if test="nameCode != '' and nameCode != null">
-                AND nameCode LIKE concat(#{nameCode}, '%')
+            <if test="unionCode != '' and unionCode != null">
+                AND nameCode LIKE concat(#{unionCode}, '%')
             </if>
             <if test="uuid != '' and uuid != null">
                 AND uuid = #{uuid}

src/main/resources/mybatis/mapper/basic/BasicUdiRelMapper.xml

@@ -49,7 +49,9 @@
                sfwwjbz,
                syqsfxyjxmj,
                qtxxdwzlj,
-               mjfs
+               mjfs,
+               p.measname,
+               p.manufactory
         FROM basic_udi_rel bur
                      left JOIN basic_udi_product p on bur.uuid = p.uuid
                      left join user_company uc on bur.companyIdFk = uc.id