Merge remote-tracking branch 'origin/dev' into dev

forest-admin/admin-mbg/src/main/java/com/hwrj/cloud/admin/model/UmsMemberOrigin.java

@@ -9,7 +9,7 @@ public class UmsMemberOrigin implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "供应商id (供应商信息表 ums_company_info -> id)")
-    private Long fkCompanyInfoId;
+    private Long compId;
 
     @ApiModelProperty(value = "供应商名称")
     private String compName;
@@ -95,12 +95,12 @@ public class UmsMemberOrigin implements Serializable {
         this.id = id;
     }
 
-    public Long getFkCompanyInfoId() {
-        return fkCompanyInfoId;
+    public Long getCompId() {
+        return compId;
     }
 
-    public void setFkCompanyInfoId(Long fkCompanyInfoId) {
-        this.fkCompanyInfoId = fkCompanyInfoId;
+    public void setCompId(Long compId) {
+        this.compId = compId;
     }
 
     public String getCompName() {
@@ -310,7 +310,7 @@ public class UmsMemberOrigin implements Serializable {
         sb.append(" [");
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
-        sb.append(", fkCompanyInfoId=").append(fkCompanyInfoId);
+        sb.append(", compId=").append(compId);
         sb.append(", compName=").append(compName);
         sb.append(", originName=").append(originName);
         sb.append(", originArea=").append(originArea);

forest-admin/admin-mbg/src/main/resources/com/hwrj/cloud/admin/mapper/UmsMemberOriginMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.hwrj.cloud.admin.mapper.UmsMemberOriginMapper">
   <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.model.UmsMemberOrigin">
     <id column="id" jdbcType="BIGINT" property="id" />
-    <result column="fk_company_info_id" jdbcType="BIGINT" property="fkCompanyInfoId" />
+    <result column="comp_id" jdbcType="BIGINT" property="compId" />
     <result column="comp_name" jdbcType="VARCHAR" property="compName" />
     <result column="origin_name" jdbcType="VARCHAR" property="originName" />
     <result column="origin_area" jdbcType="DOUBLE" property="originArea" />
@@ -91,7 +91,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, fk_company_info_id, comp_name, origin_name, origin_area, people_num, found_date, 
+    id, comp_id, comp_name, origin_name, origin_area, people_num, found_date, 
     link_user, link_phone, province_name, city_name, county_name, detail_address, altitude, 
     longitude, latitude, state, create_time, create_id, update_time, update_id
   </sql>
@@ -150,7 +150,7 @@
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into ums_member_origin (fk_company_info_id, comp_name, origin_name, 
+    insert into ums_member_origin (comp_id, comp_name, origin_name, 
       origin_area, people_num, found_date, 
       link_user, link_phone, province_name, 
       city_name, county_name, detail_address, 
@@ -159,7 +159,7 @@
       update_time, update_id, img_url, 
       video_url, vr_url, camera_url, 
       summary, remark)
-    values (#{fkCompanyInfoId,jdbcType=BIGINT}, #{compName,jdbcType=VARCHAR}, #{originName,jdbcType=VARCHAR}, 
+    values (#{compId,jdbcType=BIGINT}, #{compName,jdbcType=VARCHAR}, #{originName,jdbcType=VARCHAR}, 
       #{originArea,jdbcType=DOUBLE}, #{peopleNum,jdbcType=INTEGER}, #{foundDate,jdbcType=VARCHAR}, 
       #{linkUser,jdbcType=VARCHAR}, #{linkPhone,jdbcType=VARCHAR}, #{provinceName,jdbcType=VARCHAR}, 
       #{cityName,jdbcType=VARCHAR}, #{countyName,jdbcType=VARCHAR}, #{detailAddress,jdbcType=VARCHAR}, 
@@ -175,8 +175,8 @@
     </selectKey>
     insert into ums_member_origin
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="fkCompanyInfoId != null">
-        fk_company_info_id,
+      <if test="compId != null">
+        comp_id,
       </if>
       <if test="compName != null">
         comp_name,
@@ -253,8 +253,8 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="fkCompanyInfoId != null">
-        #{fkCompanyInfoId,jdbcType=BIGINT},
+      <if test="compId != null">
+        #{compId,jdbcType=BIGINT},
       </if>
       <if test="compName != null">
         #{compName,jdbcType=VARCHAR},
@@ -343,8 +343,8 @@
       <if test="record.id != null">
         id = #{record.id,jdbcType=BIGINT},
       </if>
-      <if test="record.fkCompanyInfoId != null">
-        fk_company_info_id = #{record.fkCompanyInfoId,jdbcType=BIGINT},
+      <if test="record.compId != null">
+        comp_id = #{record.compId,jdbcType=BIGINT},
       </if>
       <if test="record.compName != null">
         comp_name = #{record.compName,jdbcType=VARCHAR},
@@ -429,7 +429,7 @@
   <update id="updateByExampleWithBLOBs" parameterType="map">
     update ums_member_origin
     set id = #{record.id,jdbcType=BIGINT},
-      fk_company_info_id = #{record.fkCompanyInfoId,jdbcType=BIGINT},
+      comp_id = #{record.compId,jdbcType=BIGINT},
       comp_name = #{record.compName,jdbcType=VARCHAR},
       origin_name = #{record.originName,jdbcType=VARCHAR},
       origin_area = #{record.originArea,jdbcType=DOUBLE},
@@ -462,7 +462,7 @@
   <update id="updateByExample" parameterType="map">
     update ums_member_origin
     set id = #{record.id,jdbcType=BIGINT},
-      fk_company_info_id = #{record.fkCompanyInfoId,jdbcType=BIGINT},
+      comp_id = #{record.compId,jdbcType=BIGINT},
       comp_name = #{record.compName,jdbcType=VARCHAR},
       origin_name = #{record.originName,jdbcType=VARCHAR},
       origin_area = #{record.originArea,jdbcType=DOUBLE},
@@ -489,8 +489,8 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.hwrj.cloud.admin.model.UmsMemberOrigin">
     update ums_member_origin
     <set>
-      <if test="fkCompanyInfoId != null">
-        fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT},
+      <if test="compId != null">
+        comp_id = #{compId,jdbcType=BIGINT},
       </if>
       <if test="compName != null">
         comp_name = #{compName,jdbcType=VARCHAR},
@@ -572,7 +572,7 @@
   </update>
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.hwrj.cloud.admin.model.UmsMemberOrigin">
     update ums_member_origin
-    set fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT},
+    set comp_id = #{compId,jdbcType=BIGINT},
       comp_name = #{compName,jdbcType=VARCHAR},
       origin_name = #{originName,jdbcType=VARCHAR},
       origin_area = #{originArea,jdbcType=DOUBLE},
@@ -602,7 +602,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.hwrj.cloud.admin.model.UmsMemberOrigin">
     update ums_member_origin
-    set fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT},
+    set comp_id = #{compId,jdbcType=BIGINT},
       comp_name = #{compName,jdbcType=VARCHAR},
       origin_name = #{originName,jdbcType=VARCHAR},
       origin_area = #{originArea,jdbcType=DOUBLE},

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/BigCompanyController.java

@@ -76,7 +76,7 @@ public class BigCompanyController {
     public CommonResult compDetail(@RequestParam(value = "id",required = true)Long id){
         UmsCompanyDto detailCompany = umsCompanyService.getDetailCompany(id);
         UmsMemberOriginParam param = new UmsMemberOriginParam();
-        param.setFkCompanyInfoId(detailCompany.getId());
+        param.setCompId(detailCompany.getId());
         List<UmsMemberOriginParam> list = umsMemberOriginService.list(param);
         List<BigDataCompanyInfo> listBate = new ArrayList<>();
         BigDataCompanyInfo big1 = new BigDataCompanyInfo();

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsMemberOriginController.java

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.validation.Valid;
 import java.io.IOException;
 import java.security.Principal;
 import java.util.ArrayList;
@@ -85,11 +86,54 @@ public class UmsMemberOriginController {
 
     @ApiOperation(value = "查询列表",notes = "查询列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "origin",value = "",required = true,paramType = "UmsMemberOriginProductParam")
+            @ApiImplicitParam(name = "origin",value = "生产地信息",required = true,paramType = "UmsMemberOriginProductParam")
     })
     @PostMapping("/list")
     public CommonResult list(@RequestBody UmsMemberOriginParam origin){
         List<UmsMemberOriginParam> list = umsMemberOriginService.list(origin);
         return CommonResult.success(CommonPage.restPage(list));
     }
+
+    @ApiOperation(value = "新增生产地信息",notes = "新增生产地信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "origin",value = "生产地信息",required = true,paramType = "UmsMemberOriginProductParam")
+    })
+    @PostMapping("/save")
+    public CommonResult save(@RequestBody @Valid UmsMemberOriginParam origin){
+        int i = umsMemberOriginService.save(origin);
+        return CommonResult.success(i);
+    }
+
+    @ApiOperation(value = "修改生产地信息",notes = "修改生产地信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "origin",value = "生产地信息",required = true,paramType = "UmsMemberOriginProductParam")
+    })
+    @PostMapping("/update")
+    public CommonResult update(@RequestBody @Valid UmsMemberOriginParam origin){
+        int i= umsMemberOriginService.update(origin);
+        if (i > 0){
+            return CommonResult.success(i);
+        }
+        return CommonResult.failed();
+    }
+
+    @ApiOperation(value = "查询生产地详细信息",notes = "查询生产地详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id",value = "主键",required = true,paramType = "Long")
+    })
+    @GetMapping("/findById")
+    public CommonResult findById(@RequestParam("id") long id){
+        UmsMemberOriginParam param = umsMemberOriginService.findById(id);
+        return CommonResult.success(param);
+    }
+
+    @ApiOperation(value = "删除生产地信息",notes = "删除生产地信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id",value = "主键",required = true,paramType = "Long")
+    })
+    @GetMapping("/delete")
+    public CommonResult delete(@RequestParam("id") long id){
+        int i = umsMemberOriginService.delete(id);
+        return CommonResult.success(i);
+    }
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/UmsMemberOriginDao.java

@@ -22,4 +22,6 @@ public interface UmsMemberOriginDao {
     int isExist(UmsMemberOrigin umsMemberOrigin);
 
     List<UmsMemberOriginParam> list(UmsMemberOriginParam origin);
+
+    UmsMemberOriginParam findById(long id);
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dao/UmsMemberOriginProductDao.java

@@ -22,4 +22,14 @@ public interface UmsMemberOriginProductDao {
      * @return
      */
     List<UmsMemberOriginProduct> selectByOriginId(@Param("originId") Long originId);
+
+    /**
+     * 删除不存在产物
+     * lym
+     * @param ids
+     * @return
+     */
+    int delNotEqIds(@Param("ids") List<Long> ids,@Param("originId") Long originId);
+
+    int batchUpdate(@Param("list") List<UmsMemberOriginProduct> list);
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/dto/UmsMemberOriginParam.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 import java.util.List;
 
@@ -22,12 +23,13 @@ public class UmsMemberOriginParam {
     private Long id;
 
     @ApiModelProperty(value = "供应商id (供应商信息表 ums_company_info -> id)")
-    private Long fkCompanyInfoId;
+    private Long compId;
 
     @ApiModelProperty(value = "供应商名称")
     private String compName;
 
     @ApiModelProperty(value = "生产地名称")
+    @NotEmpty(message = "生产地名称不能为空!")
     private String originName;
 
     @ApiModelProperty(value = "生产地面积（亩）")

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/UmsMemberOriginProductService.java

@@ -20,4 +20,13 @@ public interface UmsMemberOriginProductService {
     int update(UmsMemberOriginProductParam originProduct);
 
     int delete(long id);
+
+    /**
+     * 添加或编辑生产地产出物
+     * lym
+     * @param list
+     * @param originId
+     * @return
+     */
+    int saveOrUpdate(List<UmsMemberOriginProduct> list,long originId);
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/UmsMemberOriginService.java

@@ -12,7 +12,15 @@ import java.util.List;
  * @date: 2020/9/5 11:18
  */
 public interface UmsMemberOriginService {
-    public int batchSave(List<UmsMemberOriginExcel> list);
+    int batchSave(List<UmsMemberOriginExcel> list);
 
     List<UmsMemberOriginParam> list(UmsMemberOriginParam origin);
+
+    int save(UmsMemberOriginParam origin);
+
+    int update(UmsMemberOriginParam origin);
+
+    UmsMemberOriginParam findById(long id);
+
+    int delete(long id);
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsMemberOriginProductServiceImpl.java

@@ -1,6 +1,7 @@
 package com.hwrj.cloud.admin.service.impl;
 
 import com.github.pagehelper.PageHelper;
+import com.hwrj.cloud.admin.dao.UmsMemberOriginProductDao;
 import com.hwrj.cloud.admin.dto.UmsMemberOriginProductParam;
 import com.hwrj.cloud.admin.mapper.UmsMemberOriginProductMapper;
 import com.hwrj.cloud.admin.model.UmsMemberOriginProduct;
@@ -13,6 +14,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -26,6 +29,8 @@ public class UmsMemberOriginProductServiceImpl implements UmsMemberOriginProduct
 
     @Resource
     private UmsMemberOriginProductMapper umsMemberOriginProductMapper;
+    @Resource
+    private UmsMemberOriginProductDao umsMemberOriginProductDao;
 
     @Override
     public List<UmsMemberOriginProduct> list(UmsMemberOriginProductParam originProduct) {
@@ -60,6 +65,7 @@ public class UmsMemberOriginProductServiceImpl implements UmsMemberOriginProduct
         BeanUtils.copyProperties(originProduct,product);
         product.setState(0);
         product.setCreateId(CurrUserUtil.getUserId());
+        product.setCreateTime(new Date());
         return umsMemberOriginProductMapper.insertSelective(product);
     }
 
@@ -70,6 +76,7 @@ public class UmsMemberOriginProductServiceImpl implements UmsMemberOriginProduct
         UmsMemberOriginProduct product = new UmsMemberOriginProduct();
         BeanUtils.copyProperties(originProduct,product);
         product.setUpdateId(CurrUserUtil.getUserId());
+        product.setUpdateTime(new Date());
         return umsMemberOriginProductMapper.updateByPrimaryKeySelective(product);
     }
 
@@ -100,4 +107,57 @@ public class UmsMemberOriginProductServiceImpl implements UmsMemberOriginProduct
         product.setState(2);
         return umsMemberOriginProductMapper.updateByPrimaryKeySelective(product);
     }
+
+    @Override
+    public int saveOrUpdate(List<UmsMemberOriginProduct> list, long originId) {
+        List<UmsMemberOriginProduct> saveList = new ArrayList<>(),updateList = new ArrayList<>();
+        List<Long> ids = new ArrayList<>();
+        for (UmsMemberOriginProduct product:list){
+            product.setFkOriginId(originId);
+            if (StringUtils.isEmpty(product.getId())){
+                isExistOriginProduct(product);
+                product.setCreateId(CurrUserUtil.getUserId());
+                product.setState(0);
+                saveList.add(product);
+            }else {
+                isExistOriginProduct(product);
+                ids.add(product.getId());
+                product.setUpdateId(CurrUserUtil.getUserId());
+                updateList.add(product);
+            }
+        }
+
+        //删除
+        int i = 0;
+        if (ids != null && ids.size() > 0)
+            i = umsMemberOriginProductDao.delNotEqIds(ids,originId);
+
+        if (saveList != null && saveList.size() > 0){
+            i = umsMemberOriginProductDao.batchSave(saveList);
+        }
+        if (updateList != null && updateList.size() > 0){
+            i = umsMemberOriginProductDao.batchUpdate(updateList);
+        }
+        return i;
+    }
+
+    /**
+     * 检验唯一
+     * lym
+     * @param originProduct
+     */
+    private void isExistOriginProduct(UmsMemberOriginProduct originProduct){
+        UmsMemberOriginProductExample example = new UmsMemberOriginProductExample();
+        UmsMemberOriginProductExample.Criteria criteria = example.createCriteria();
+        if (!StringUtils.isEmpty(originProduct.getId())){
+            criteria.andIdNotEqualTo(originProduct.getId());
+        }
+        criteria.andFkOriginIdEqualTo(originProduct.getFkOriginId());
+        criteria.andProductNameEqualTo(originProduct.getProductName());
+        criteria.andStateEqualTo(0);
+        long i = umsMemberOriginProductMapper.countByExample(example);
+        if (i > 0){
+            throw new GlobalException(500,"产出物已存在!");
+        }
+    }
 }

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsMemberOriginServiceImpl.java

@@ -10,10 +10,14 @@ import com.hwrj.cloud.admin.model.UmsCompanyInfo;
 import com.hwrj.cloud.admin.model.UmsCompanyInfoExample;
 import com.hwrj.cloud.admin.model.UmsMemberOrigin;
 import com.hwrj.cloud.admin.model.UmsMemberOriginProduct;
+import com.hwrj.cloud.admin.service.UmsMemberOriginProductService;
 import com.hwrj.cloud.admin.service.UmsMemberOriginService;
 import com.hwrj.cloud.admin.util.CurrUserUtil;
+import com.hwrj.cloud.common.exception.GlobalException;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
@@ -38,6 +42,8 @@ public class UmsMemberOriginServiceImpl implements UmsMemberOriginService {
 
     @Resource
     private UmsCompanyInfoMapper umsCompanyInfoMapper;
+    @Autowired
+    private UmsMemberOriginProductService umsMemberOriginProductService;
 
     @Override
     //@Transactional
@@ -53,7 +59,7 @@ public class UmsMemberOriginServiceImpl implements UmsMemberOriginService {
 //            if (i > 0) continue; //已存在
             List<UmsCompanyInfo> umsCompanyInfos = companyInfoList(excel.getCompName());
             if (umsCompanyInfos != null && umsCompanyInfos.size()>0){
-                origin.setFkCompanyInfoId(umsCompanyInfos.get(0).getId());
+                origin.setCompId(umsCompanyInfos.get(0).getId());
             }
             i = umsMemberOriginMapper.insertSelective(origin); //添加生产地信息
             if (i > 0){
@@ -142,4 +148,56 @@ public class UmsMemberOriginServiceImpl implements UmsMemberOriginService {
         return umsCompanyInfos;
     }
 
+    @Override
+    public int save(UmsMemberOriginParam origin) {
+        UmsMemberOrigin umsMemberOrigin = new UmsMemberOrigin();
+        List<UmsMemberOriginProduct> originProductList = origin.getProductlist();
+        BeanUtils.copyProperties(origin,umsMemberOrigin);
+        //检验是否唯一
+        int i = umsMemberOriginDao.isExist(umsMemberOrigin);
+        if (i > 0) {
+            throw new GlobalException(1,"生产地已存在!");
+        }
+
+        i = umsMemberOriginMapper.insertSelective(umsMemberOrigin); //添加生产地信息
+        if (i > 0 && originProductList != null && originProductList.size() > 0) { //添加产地产出物信息
+            umsMemberOriginProductService.saveOrUpdate(originProductList,umsMemberOrigin.getId());
+        }
+
+        return i;
+    }
+
+    @Override
+    @Transactional
+    public int update(UmsMemberOriginParam origin) {
+        UmsMemberOrigin umsMemberOrigin = new UmsMemberOrigin();
+        List<UmsMemberOriginProduct> originProductList = origin.getProductlist();
+        BeanUtils.copyProperties(origin,umsMemberOrigin);
+        //检验是否唯一
+        int i = umsMemberOriginDao.isExist(umsMemberOrigin);
+        if (i > 0) {
+            throw new GlobalException(1,"生产地已存在!");
+        }
+
+        i = umsMemberOriginMapper.updateByPrimaryKeySelective(umsMemberOrigin); //修改生产地信息
+        if (i > 0 && originProductList != null && originProductList.size() > 0) { //添加或修改产地产出物信息
+            umsMemberOriginProductService.saveOrUpdate(originProductList,umsMemberOrigin.getId());
+        }
+
+        return i;
+    }
+
+    @Override
+    public UmsMemberOriginParam findById(long id) {
+        return umsMemberOriginDao.findById(id);
+    }
+
+    @Override
+    public int delete(long id) {
+        UmsMemberOrigin origin = new UmsMemberOrigin();
+        origin.setId(id);
+        origin.setState(2);
+        return umsMemberOriginMapper.updateByPrimaryKeySelective(origin);
+    }
+
 }

forest-admin/admin-server/src/main/resources/dao/UmsMemberOriginDao.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.hwrj.cloud.admin.dao.UmsMemberOriginDao">
     <resultMap id="BaseResultMap" type="com.hwrj.cloud.admin.dto.UmsMemberOriginParam">
         <id column="id" jdbcType="BIGINT" property="id" />
-        <result column="fk_company_info_id" jdbcType="BIGINT" property="fkCompanyInfoId" />
+        <result column="comp_id" jdbcType="BIGINT" property="compId" />
         <result column="comp_name" jdbcType="VARCHAR" property="compName" />
         <result column="origin_name" jdbcType="VARCHAR" property="originName" />
         <result column="origin_area" jdbcType="DOUBLE" property="originArea" />
@@ -42,7 +42,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id, fk_company_info_id, comp_name, origin_name, origin_area, people_num, found_date,
+        id, comp_id, comp_name, origin_name, origin_area, people_num, found_date,
         link_user, link_phone, province_name, city_name, county_name, detail_address, altitude,
         longitude, latitude, state, create_time, create_id, update_time, update_id
     </sql>
@@ -56,6 +56,9 @@
         <if test="id != null">
             AND id != #{id}
         </if>
+        <if test="compId != null">
+            AND comp_id = #{compId}
+        </if>
         AND origin_name = #{originName}
     </select>
 
@@ -63,8 +66,8 @@
         select <include refid="Base_Column_List" />,<include refid="Blob_Column_List" />
         from ums_member_origin
         WHERE state = 0
-        <if test="fkCompanyInfoId != null">
-            AND fk_company_info_id = #{fkCompanyInfoId,jdbcType=BIGINT}
+        <if test="compId != null">
+            AND comp_id = #{compId,jdbcType=BIGINT}
         </if>
         <if test="originName != null and originName != ''">
             AND origin_name = #{originName,jdbcType=VARCHAR}
@@ -74,4 +77,11 @@
         </if>
         ORDER BY create_time desc
     </select>
+
+    <select id="findById" parameterType="long" resultMap="ResultOriginProduct">
+        select <include refid="Base_Column_List" />,<include refid="Blob_Column_List" />
+        from ums_member_origin
+        WHERE state = 0
+        AND id = #{id,jdbcType=BIGINT}
+    </select>
 </mapper>

forest-admin/admin-server/src/main/resources/dao/UmsMemberOriginProductDao.xml

@@ -50,4 +50,55 @@
         </if>
         ORDER BY create_time desc
     </select>
+
+    <!-- 删除不存在产物 lym -->
+    <update id="delNotEqIds">
+        update ums_member_origin_product
+        set state = 2
+        where fk_origin_id = #{originId,jdbcType=BIGINT}
+        AND id NOT IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <update id="batchUpdate" parameterType="com.hwrj.cloud.admin.model.UmsMemberOriginProduct">
+        <foreach collection="list" item="item" separator=";">
+        update ums_member_origin_product
+        <set>
+            <if test="item.fkOriginId != null">
+                fk_origin_id = #{item.fkOriginId,jdbcType=BIGINT},
+            </if>
+            <if test="item.productName != null">
+                product_name = #{item.productName,jdbcType=VARCHAR},
+            </if>
+            <if test="item.plantArea != null">
+                plant_area = #{item.plantArea,jdbcType=VARCHAR},
+            </if>
+            <if test="item.outputNum != null">
+                output_num = #{item.outputNum,jdbcType=VARCHAR},
+            </if>
+            <if test="item.outputValue != null">
+                output_value = #{item.outputValue,jdbcType=VARCHAR},
+            </if>
+            <if test="item.state != null">
+                state = #{item.state,jdbcType=INTEGER},
+            </if>
+            <if test="item.createTime != null">
+                create_time = #{item.createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="item.createId != null">
+                create_id = #{item.createId,jdbcType=INTEGER},
+            </if>
+            update_time = NOW(),
+            <if test="item.updateId != null">
+                update_id = #{item.updateId,jdbcType=INTEGER},
+            </if>
+            <if test="item.remark != null">
+                remark = #{item.remark,jdbcType=LONGVARCHAR},
+            </if>
+        </set>
+        where id = #{item.id,jdbcType=BIGINT}
+        </foreach>
+    </update>
 </mapper>