Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_svr

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java

@@ -165,4 +165,6 @@ public class PublicController extends BaseController {
     public AjaxResult zcgList(ZcgSearchForm form) {
         return AjaxResult.success(zcgService.queryList(form));
     }
+
+
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java

@@ -8,6 +8,7 @@ import com.hxhq.business.dto.study.StudyFormFillListDto;
 import com.hxhq.business.form.study.StudyFormFillGcForm;
 import com.hxhq.business.form.study.StudyFormFillShfzForm;
 import com.hxhq.business.form.study.StudyFormFillSearchForm;
+import com.hxhq.business.form.study.StudyFormFillUpdateForm;
 import com.hxhq.business.service.*;
 import com.hxhq.common.security.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -193,4 +194,39 @@ public class StudyFormFillController extends BaseController {
         studyFormFillService.sy(studyFormFill);
         return AjaxResult.success("操作成功");
     }
+
+    /**
+     * 保存表单内容
+     */
+    @PostMapping("/updateBdnr")
+    @RequiresPermissions({"business:studyFormFill:bj","business:studyFormFill:xz",
+            "business:nonTrialFormFill:bj","business:nonTrialFormFill:xz",
+            "business:drugFormFill:bj","business:drugFormFill:xz"})
+    public AjaxResult updateBdnr(@RequestBody StudyFormFillUpdateForm form) {
+        studyFormFillService.updateBdnr(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 保存复核意见
+     */
+    @PostMapping("/updateFhyjjl")
+    @RequiresPermissions({"business:studyFormFill:fh","business:nonTrialFormFill:fh","business:drugFormFill:fh"})
+    public AjaxResult updateFhyjjl(@RequestBody StudyFormFillUpdateForm form) {
+        studyFormFillService.updateFhyjjl(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 保存字段修改记录
+     */
+    @PostMapping("/updateZdxgjl")
+    @RequiresPermissions({"business:studyFormFill:bj","business:studyFormFill:xz",
+            "business:nonTrialFormFill:bj","business:nonTrialFormFill:xz",
+            "business:drugFormFill:bj","business:drugFormFill:xz"})
+    public AjaxResult updateZdxgjl(@RequestBody StudyFormFillUpdateForm form) {
+        studyFormFillService.updateZdxgjl(form);
+        return AjaxResult.success("操作成功");
+    }
+
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java

@@ -56,6 +56,9 @@ public class StudyFormFill extends MpBaseEntity
     /** 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成；9：待废止；11：已废止 */
     private Integer bdzt;
 
+    /** 是否填报：1：未填报；10：已填报*/
+    private Integer sftb;
+
     /** 提交时间 */
     @Excel(name = "提交时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -70,6 +73,12 @@ public class StudyFormFill extends MpBaseEntity
     /** 存储list */
     private String cclist;
 
+    /** 字段修改记录 */
+    private String zdxgjl;
+
+    /** 复核意见记录 */
+    private String fhyjjl;
+
     /** 填报开始时间 */
     @Excel(name = "填报开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -109,6 +118,30 @@ public class StudyFormFill extends MpBaseEntity
     @TableField(exist = false)
     private String studyMc;
 
+    public String getZdxgjl() {
+        return zdxgjl;
+    }
+
+    public void setZdxgjl(String zdxgjl) {
+        this.zdxgjl = zdxgjl;
+    }
+
+    public String getFhyjjl() {
+        return fhyjjl;
+    }
+
+    public void setFhyjjl(String fhyjjl) {
+        this.fhyjjl = fhyjjl;
+    }
+
+    public Integer getSftb() {
+        return sftb;
+    }
+
+    public void setSftb(Integer sftb) {
+        this.sftb = sftb;
+    }
+
     public String getCzlist() {
         return czlist;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/template/ProductEnum.java

@@ -0,0 +1,61 @@
+package com.hxhq.business.enums.template;
+
+/**
+ * 产物：1：试剂；3：供试品；5：给药制剂；7：麻精药
+ * @author tanfei
+ */
+public enum ProductEnum {
+
+    /**
+     * 试剂
+     */
+    Sj(1, "试剂"),
+
+    /**
+     * 供试品
+     */
+    Gsp(3, "供试品"),
+
+    /**
+     * 给药制剂
+     */
+    Gyzj(5, "给药制剂"),
+
+    /**
+     * 麻精药
+     */
+    Mjy(7, "麻精药");
+
+    private int value;
+    private String text;
+
+    ProductEnum(int value, String text) {
+        this.value = value;
+        this.text = text;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public static ProductEnum getEnumByValue(int type) {
+        for (ProductEnum bt : values()) {
+            if (bt.value == type) {
+                return bt;
+            }
+        }
+        return null;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillUpdateForm.java

@@ -0,0 +1,61 @@
+package com.hxhq.business.form.study;
+
+/**
+ * @author tanfei
+ */
+public class StudyFormFillUpdateForm {
+    /** id */
+    private Long id;
+
+    /** 表单内容 */
+    private String bdnr;
+
+    /** 字段修改记录 */
+    private String zdxgjl;
+
+    /** 当前字段修改内容 */
+    private String filedValue;
+
+    /** 复核意见记录 */
+    private String fhyjjl;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getBdnr() {
+        return bdnr;
+    }
+
+    public void setBdnr(String bdnr) {
+        this.bdnr = bdnr;
+    }
+
+    public String getZdxgjl() {
+        return zdxgjl;
+    }
+
+    public void setZdxgjl(String zdxgjl) {
+        this.zdxgjl = zdxgjl;
+    }
+
+    public String getFiledValue() {
+        return filedValue;
+    }
+
+    public void setFiledValue(String filedValue) {
+        this.filedValue = filedValue;
+    }
+
+    public String getFhyjjl() {
+        return fhyjjl;
+    }
+
+    public void setFhyjjl(String fhyjjl) {
+        this.fhyjjl = fhyjjl;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormFillMapper.java

@@ -32,4 +32,26 @@ public interface StudyFormFillMapper extends BaseMapper
      * @return
      */
     StudyFormFill queryInfo(@Param("id") Long id);
+
+    /**
+     * 更新表单内容
+     * @param id
+     * @param bdnr
+     */
+    void updateBdnr(@Param("id") Long id,@Param("bdnr") String bdnr);
+
+    /**
+     * 更新复核意见
+     * @param id
+     * @param fhyjjl
+     */
+    void updateFhyjjl(@Param("id") Long id,@Param("fhyjjl") String fhyjjl);
+
+    /**
+     * 更新字段修改记录
+     * @param id
+     * @param zdxgjl
+     */
+    void updateZdxgjl(@Param("id") Long id,@Param("zdxgjl") String zdxgjl);
+
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java

@@ -8,6 +8,11 @@ import com.hxhq.business.dto.study.StudyFormFillListDto;
 import com.hxhq.business.form.study.StudyFormFillGcForm;
 import com.hxhq.business.form.study.StudyFormFillSearchForm;
 import com.hxhq.business.form.study.StudyFormFillShfzForm;
+import com.hxhq.business.form.study.StudyFormFillUpdateForm;
+import com.hxhq.common.core.web.domain.AjaxResult;
+import com.hxhq.common.security.annotation.RequiresPermissions;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * 试验-填报单Service接口
@@ -104,4 +109,20 @@ public interface IStudyFormFillService extends IService
      * @param studyFormFill
      */
     public void sy(StudyFormFill studyFormFill);
+
+    /**
+     * 更新表单内容
+     */
+    public void updateBdnr(StudyFormFillUpdateForm form);
+
+    /**
+     * 更新复核意见
+     */
+    public void updateFhyjjl(StudyFormFillUpdateForm form);
+
+    /**
+     * 更新字段修改记录
+     */
+    public void updateZdxgjl(StudyFormFillUpdateForm form);
+
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java

@@ -11,15 +11,15 @@ import com.hxhq.business.enums.NormalEnum;
 import com.hxhq.business.enums.study.StudyFormApplyBdztEnum;
 import com.hxhq.business.enums.study.StudyFormFillBdztEnum;
 import com.hxhq.business.enums.study.StudyFormFillBdztEnum;
+import com.hxhq.business.enums.template.ProductEnum;
 import com.hxhq.business.enums.zykgl.JcgjlxEnum;
 import com.hxhq.business.enums.zykgl.JcmcysEnum;
 import com.hxhq.business.enums.zykgl.JlztEnum;
-import com.hxhq.business.form.study.StudyFormFillGcForm;
-import com.hxhq.business.form.study.StudyFormFillSearchForm;
-import com.hxhq.business.form.study.StudyFormFillShfzForm;
+import com.hxhq.business.form.study.*;
 import com.hxhq.business.form.study.StudyFormFillSearchForm;
 import com.hxhq.business.service.IStudyFormFillJcgjService;
 import com.hxhq.business.service.IStudyFormFillQmxxService;
+import com.hxhq.business.service.ITemplateService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.business.utils.ObjectCompareUtil;
 import com.hxhq.common.core.exception.ServiceException;
@@ -49,6 +49,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl
     private IStudyFormFillQmxxService studyFormFillQmxxService;
     @Autowired
     private ISysUserService sysUserService;
+    @Autowired
+    private ITemplateService templateService;
 
     /**
      * 查询试验-填报单列表
@@ -321,22 +323,19 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         checkPassword(SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getQmrmm());
         if (studyFormFill.getId() != null) {
             StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
-            if (studyFormFillOld == null) {
-                throw new ServiceException("信息不存在或已删除");
-            }
-            if (!SecurityUtils.getUserId().equals(studyFormFillOld.getUserId())) {
-                throw new ServiceException("只能操作自己的表单");
-            }
             studyFormFillOld.setBdmc(studyFormFill.getBdmc());
             studyFormFillOld.setBdnr(studyFormFill.getBdnr());
             studyFormFillOld.setResource(studyFormFill.getResource());
-            studyFormFillOld.setCclist(studyFormFill.getCclist());
-            studyFormFillOld.setCzlist(studyFormFill.getCzlist());
-            studyFormFillOld.setEndDate(new Date());
             studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ytj.getValue());
+            if (studyFormFillOld.getSftb().equals(NormalEnum.no.getValue())) {
+                studyFormFillOld.setEndDate(new Date());
+                studyFormFillOld.setCclist(studyFormFill.getCclist());
+                studyFormFillOld.setCzlist(studyFormFill.getCzlist());
+                //生成物资
+                genResource(studyFormFillOld);
+            }
+            studyFormFillOld.setSftb(NormalEnum.yes.getValue());
             this.updateById(studyFormFillOld);
-            // todo 处置，存放，用量
-
             List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjects(studyFormFillOld, studyFormFill);
             if (fieldChanges.size() > 0) {
                 //稽查轨迹
@@ -362,8 +361,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             studyFormFill.setBdzt(StudyFormFillBdztEnum.ytj.getValue());
             studyFormFill.setUserId(SecurityUtils.getUserId());
             studyFormFill.setUserMc(SecurityUtils.getNickName());
+            studyFormFill.setSftb(NormalEnum.yes.getValue());
             this.save(studyFormFill);
-
+            //生成物资
+            genResource(studyFormFill);
             //稽查轨迹
             Map<String, String> formData = new LinkedHashMap<>();
             formData.put("备注", studyFormFill.getRemark());
@@ -374,6 +375,23 @@ public class StudyFormFillServiceImpl extends ServiceImpl
 
     }
 
+    /**
+     * 生成物资
+     * @param studyFormFill
+     */
+    public void genResource(StudyFormFill studyFormFill){
+        Template template = templateService.getById(studyFormFill.getTemplateId());
+        // todo 处置，存放，用量
+        if (template.getProduct().equals(ProductEnum.Gsp.getValue())) {
+
+        }
+        if (template.getProduct().equals(ProductEnum.Gyzj.getValue())) {
+
+        }
+        if (template.getProduct().equals(ProductEnum.Mjy.getValue())) {
+
+        }
+    }
 
     /**
      * 观察
@@ -541,4 +559,29 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         sysUserService.checkPassword(user, qmrmm, false);
     }
 
+    /**
+     * 更新表单内容
+     */
+    @Override
+    public void updateBdnr(StudyFormFillUpdateForm form) {
+        baseMapper.updateBdnr(form.getId(), form.getBdnr());
+    }
+
+    /**
+     * 更新复核意见
+     */
+    @Override
+    public void updateFhyjjl(StudyFormFillUpdateForm form) {
+        baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
+    }
+
+    /**
+     * 更新字段修改记录
+     */
+    @Override
+    public void updateZdxgjl(StudyFormFillUpdateForm form) {
+        baseMapper.updateZdxgjl(form.getId(), form.getZdxgjl());
+        //新增稽查轨迹  todo
+    }
+
 }

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml

@@ -24,4 +24,17 @@
         join t_study ts on ts.id=t.study_id
         where t.id=#{id}
     </select>
+
+    <update id="updateBdnr" >
+        update  t_study_form_fill set bdnr=#{bdnr} where id=#{id};
+    </update>
+
+    <update id="updateFhyjjl" >
+        update  t_study_form_fill set fhyjjl=#{fhyjjl}  where id=#{id};
+    </update>
+
+    <update id="updateZdxgjl" >
+        update  t_study_form_fill set zdxgjl=#{zdxgjl}  where id=#{id};
+    </update>
+
 </mapper>