会诊模板修改

ruoyi-admin/src/main/java/org/dromara/web/domain/bo/ConsultantResultTemplateBo.java

@@ -48,6 +48,8 @@ public class ConsultantResultTemplateBo extends BaseEntity {
      */
     private String content;
 
+    private String contentStr;
+
     private Long updateDept;
 
 

ruoyi-admin/src/main/java/org/dromara/web/service/impl/ConsultantResultTemplateServiceImpl.java

@@ -19,6 +19,9 @@ import org.dromara.web.mapper.ConsultantResultTemplateMapper;
 import org.dromara.web.service.IConsultantResultTemplateService;
 import org.springframework.stereotype.Service;
 
+import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -91,6 +94,7 @@ public class ConsultantResultTemplateServiceImpl implements IConsultantResultTem
         LambdaQueryWrapper<ConsultantResultTemplate> lqw = Wrappers.lambdaQuery();
         lqw.orderByAsc(ConsultantResultTemplate::getId);
         lqw.eq(bo.getTemplateTypeId() != null, ConsultantResultTemplate::getTemplateTypeId, bo.getTemplateTypeId());
+        lqw.eq(bo.getCreateBy() != null, ConsultantResultTemplate::getCreateBy, bo.getCreateBy());
         if (StringUtils.isNotBlank(bo.getSearchValue())) {
             lqw.and(wrapper -> wrapper.like(ConsultantResultTemplate::getTemplateName, bo.getSearchValue())
                 .or().like(ConsultantResultTemplate::getDescription, bo.getSearchValue())
@@ -108,6 +112,7 @@ public class ConsultantResultTemplateServiceImpl implements IConsultantResultTem
      */
     @Override
     public Boolean insertByBo(ConsultantResultTemplateBo bo) {
+        bo.setContent(URLDecoder.decode(new String(Base64.getDecoder().decode(bo.getContentStr()), StandardCharsets.UTF_8)));
         ConsultantResultTemplate add = MapstructUtils.convert(bo, ConsultantResultTemplate.class);
         validEntityBeforeSave(add);
         add.setUpdateDept(bo.getCreateDept());
@@ -126,6 +131,7 @@ public class ConsultantResultTemplateServiceImpl implements IConsultantResultTem
      */
     @Override
     public Boolean updateByBo(ConsultantResultTemplateBo bo) {
+        bo.setContent(URLDecoder.decode(new String(Base64.getDecoder().decode(bo.getContentStr()), StandardCharsets.UTF_8)));
         ConsultantResultTemplate update = MapstructUtils.convert(bo, ConsultantResultTemplate.class);
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
@@ -136,6 +142,7 @@ public class ConsultantResultTemplateServiceImpl implements IConsultantResultTem
      */
     private void validEntityBeforeSave(ConsultantResultTemplate entity) {
         //TODO 做一些数据校验,如唯一约束
+
     }
 
     /**