Bläddra i källkod

feat(his): 更新销售公司管理功能

- 修改控制器注释和日志标题为“销售公司”
- 在新增、修改、删除及导出接口中更新业务类型描述
- 优化SOP模板规则判断逻辑,增加空值检查
- 调整小程序设置中的公司名称判断条件
- 完善时间描述相关的内容生成逻辑,避免越界访问
xw 1 vecka sedan
förälder
incheckning
96ce0413e5

+ 6 - 6
fs-admin/src/main/java/com/fs/his/controller/FsCompanyController.java

@@ -71,7 +71,7 @@ public class FsCompanyController extends BaseController {
     @Autowired
     private ICompanyDivConfigService companyDivConfigService;
     /**
-     * 查询诊所管理列表
+     * 查询销售公司列表
      */
     @PreAuthorize("@ss.hasPermi('his:company:list')")
     @GetMapping("/list")
@@ -106,7 +106,7 @@ public class FsCompanyController extends BaseController {
      * 导出诊所管理列表
      */
     @PreAuthorize("@ss.hasPermi('his:company:export')")
-    @Log(title = "诊所管理", businessType = BusinessType.EXPORT)
+    @Log(title = "销售公司", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(Company company)
     {
@@ -142,10 +142,10 @@ public class FsCompanyController extends BaseController {
     }
 
     /**
-     * 新增诊所管理
+     * 新增销售公司管理
      */
     @PreAuthorize("@ss.hasPermi('his:company:add')")
-    @Log(title = "诊所管理", businessType = BusinessType.INSERT)
+    @Log(title = "销售公司", businessType = BusinessType.INSERT)
     @PostMapping
     public R add(@RequestBody Company company)
     {
@@ -162,7 +162,7 @@ public class FsCompanyController extends BaseController {
      * 修改诊所管理
      */
     @PreAuthorize("@ss.hasPermi('his:company:edit')")
-    @Log(title = "诊所管理", businessType = BusinessType.UPDATE)
+    @Log(title = "销售公司", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Company company)
     {
@@ -175,7 +175,7 @@ public class FsCompanyController extends BaseController {
      * 删除诊所管理
      */
     @PreAuthorize("@ss.hasPermi('his:company:remove')")
-    @Log(title = "诊所管理", businessType = BusinessType.DELETE)
+    @Log(title = "销售公司", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{companyIds}")
     public AjaxResult remove(@PathVariable Long[] companyIds)
     {

+ 5 - 5
fs-service/src/main/java/com/fs/sop/service/impl/QwSopTempServiceImpl.java

@@ -462,17 +462,17 @@ public class QwSopTempServiceImpl implements IQwSopTempService
                 QwSopTempRules rules = new QwSopTempRules();
                 rules.setTempId(temp.getId());
                 rules.setName(day.getName());
-                if (temp.getOpenOfficial().equals("1")){
+                if (temp.getOpenOfficial() != null && temp.getOpenOfficial().equals("1")){
                     rules.setIsOfficial(sorts.get() == 0 ? "1" : "0");
                 }else {
                     rules.setIsOfficial("0");
                 }
-                if (temp.getOpenIsAtAll().equals("1")){
+                if (temp.getOpenIsAtAll() != null && temp.getOpenIsAtAll().equals("1")){
                     rules.setIsAtAll(1);
                 }else {
                     rules.setIsAtAll(0);
                 }
-                if (day.getDayNum()==1 && sorts.get() == 0 && temp.getOpenOfficial().equals("1")){
+                if (day.getDayNum()==1 && sorts.get() == 0 && temp.getOpenOfficial() != null && temp.getOpenOfficial().equals("1")){
                     rules.setTime("01:05");
                 }else {
                     rules.setTime(time);
@@ -493,7 +493,7 @@ public class QwSopTempServiceImpl implements IQwSopTempService
                 setting.setMiniprogramTitle(e.getTitle());
 
                 //用课节图片做封面
-                if("今正科技".equals(cloudHostProper.getCompanyName())){
+                if(cloudHostProper != null && cloudHostProper.getCompanyName() != null && "今正科技".equals(cloudHostProper.getCompanyName())){
                     setting.setMiniprogramPicUrl(!StringUtil.isNullOrEmpty(e.getThumbnail())?e.getThumbnail():fsUserCourse.getImgUrl());
                     setting.setLinkImageUrl(!StringUtil.isNullOrEmpty(e.getThumbnail())?e.getThumbnail():fsUserCourse.getImgUrl());
                 }else {
@@ -519,7 +519,7 @@ public class QwSopTempServiceImpl implements IQwSopTempService
                     content2.setContent(JSON.toJSONString(setting2));
                     qwSopTempContents.add(content2);
                 }
-                if (sorts.get() > 0){
+                if (sorts.get() > 0 && temp.getTimeDesc() != null && !temp.getTimeDesc().isEmpty() && sorts.get() <= temp.getTimeDesc().size()){
 
                     QwSopTempContent content3 = new QwSopTempContent();
                     content3.setTempId(temp.getId());