Merge remote-tracking branch 'origin/master'

# Conflicts:
#	science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java

science-admin/src/main/java/com/yiboshi/science/dao/ComProjectManufactureDAO.java

@@ -3,7 +3,6 @@ package com.yiboshi.science.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yiboshi.science.base.BaseDAO;
 import com.yiboshi.science.entity.ComProjectManufacture;
-import com.yiboshi.science.param.dto.ComProjectEquipmentDTO;
 import com.yiboshi.science.param.dto.ComProjectManufactureDTO;
 import com.yiboshi.science.param.query.ComProjectManufactureQueryVO;
 
@@ -16,5 +15,5 @@ import java.util.List;
  * @version 2024-12-16
  */
 public interface ComProjectManufactureDAO extends BaseMapper<ComProjectManufacture>, BaseDAO<ComProjectManufactureQueryVO, ComProjectManufactureDTO, ComProjectManufacture> {
-    List<ComProjectEquipmentDTO> getListByObjectId(String objectId);
+    List<ComProjectManufactureDTO> getListByObjectId(String objectId);
 }
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java

@@ -329,6 +329,8 @@ public class ComProjectDTO extends BaseDTO {
     private List<ComProjectEquipmentDTO> equipments;
     /** 购置设备预算明细表 */
     private List<ComProjectEquipmentDTO> deviceList;
+    /** 试制设备预算明细表 */
+    private List<ComProjectManufactureDTO> manufacture;
     /** 附件列表 */
     private List<ComFileDTO> fileList;
     /** 审核列表 */

science-admin/src/main/java/com/yiboshi/science/service/ComProjectManufactureService.java

+package com.yiboshi.science.service;
+
+import com.yiboshi.science.base.BaseService;
+import com.yiboshi.science.entity.ComProjectManufacture;
+import com.yiboshi.science.param.dto.ComProjectEquipmentDTO;
+import com.yiboshi.science.param.dto.ComProjectManufactureDTO;
+import com.yiboshi.science.param.query.ComProjectManufactureQueryVO;
+
+import java.util.List;
+
+/**
+ * 试制设备预算明细表 Service
+ * 
+ * @author xujun
+ * @version 2024-12-16
+ */
+public interface ComProjectManufactureService extends BaseService<ComProjectManufactureQueryVO, ComProjectManufactureDTO, ComProjectManufacture> {
+
+    /**
+     * 根据对象获取经费列表
+     *
+     * @param objectId
+     * @return
+     */
+    List<ComProjectManufactureDTO> getListByObjectId(String objectId);
+
+    /**插入经费表
+     *
+     * @param budgetList
+     * @param objectId
+     */
+    void insertEquipmentList(List<ComProjectManufactureDTO> budgetList, String objectId);
+
+    /** 删除对象列表
+     *
+     * @param objectId
+     */
+    void deleteByObjectId(String objectId);
+
+}
\ No newline at end of file

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectManufactureServiceImpl.java

+package com.yiboshi.science.service.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yiboshi.science.base.BaseServiceImpl;
+import com.yiboshi.science.dao.ComProjectManufactureDAO;
+import com.yiboshi.science.entity.ComProjectManufacture;
+import com.yiboshi.science.param.dto.ComProjectManufactureDTO;
+import com.yiboshi.science.param.query.ComProjectManufactureQueryVO;
+import com.yiboshi.science.service.ComProjectManufactureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 试制设备预算明细表 Service 实现类
+ *
+ * @author lkl
+ * @version 2021-08-26
+ */
+@Service
+public class ComProjectManufactureServiceImpl extends BaseServiceImpl<ComProjectManufactureDAO, ComProjectManufactureQueryVO, ComProjectManufactureDTO, ComProjectManufacture> implements ComProjectManufactureService {
+
+    @Autowired
+    private ComProjectManufactureDAO comProjectManufactureDAO;
+
+    @Override
+    protected void setCriteriaForQuery(ComProjectManufactureQueryVO vo, QueryWrapper<ComProjectManufactureQueryVO> criteria) {
+
+    }
+
+    @Override
+    public List<ComProjectManufactureDTO> getListByObjectId(String objectId) {
+        return comProjectManufactureDAO.getListByObjectId(objectId);
+    }
+
+    @Override
+    public void insertEquipmentList(List<ComProjectManufactureDTO> budgetList, String objectId) {
+        ComProjectManufacture E = new ComProjectManufacture();
+        E.setObjectId(objectId);
+        this.delete(E);
+        if (null != budgetList) {
+            budgetList.forEach((e) -> {
+                if (!isObjectNull(e)) {
+                    e.setObjectId(objectId);
+                    ComProjectManufacture comProjectManufacture = convert2Entity(e);
+                    this.insert(comProjectManufacture);
+                }
+            });
+//            budgetList.forEach(e -> e.setObjectId(objectId));
+//            List<ComProjectEquipment> list = convertDto2EntityList(budgetList);
+//            this.insertBatch(list);
+        }
+    }
+
+    @Override
+    public void deleteByObjectId(String objectId) {
+        ComProjectManufacture E =new ComProjectManufacture();
+        E.setObjectId(objectId);
+        this.delete(E);
+    }
+}
\ No newline at end of file