Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

pom.xml

@@ -184,7 +184,9 @@
             <properties>
                 <env>local</env>
             </properties>
-
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
         <profile>
             <id>dev</id>
@@ -202,9 +204,7 @@
             <id>prod</id>
             <properties>
                 <env>prod</env>
-            </properties><activation>
-            <activeByDefault>true</activeByDefault>
-        </activation>
+            </properties>
         </profile>
     </profiles>
     <build>

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonUserController.java

@@ -3,6 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 import com.baomidou.mybatisplus.plugins.Page;
 import com.winsea.svc.base.base.entity.CommonCompany;
+import com.winsea.svc.base.base.entity.CommonStaffRole;
 import com.winsea.svc.base.base.service.ICommonCompanyService;
 import com.winsea.svc.base.base.service.ICommonStaffService;
 import com.winsea.svc.base.base.util.ClientTypeChecker;
@@ -213,6 +214,16 @@ public class CommonUserController {
         return commonUserService.checkSession();
     }
 
+    /**
+     * 次要职务
+     *
+     * @return
+     * @throws ServiceException
+     */
+    @PostMapping("/api/saveRole")
+    public String saveRole(@RequestBody CommonStaffRole commonStaffRole) {
+        return commonUserService.saveRole(commonStaffRole);
+    }
 
 }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICommonUserService.java

@@ -1,6 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
+import com.winsea.svc.base.base.entity.CommonStaffRole;
 import com.winsea.svc.base.security.entity.Account;
 import com.winsea.svc.notice.entity.NoticeTaskInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
@@ -78,4 +79,6 @@ public interface ICommonUserService extends IService<CommonUser> {
 
     String checkApp(CommonUser commonUser) throws ServiceException;
     String checkSession() throws ServiceException;
+
+    String saveRole(CommonStaffRole commonStaffRole);
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -9,6 +9,7 @@ import com.google.common.collect.Sets;
 import com.winsea.svc.base.base.entity.CommonCompany;
 import com.winsea.svc.base.base.entity.CommonDepartment;
 import com.winsea.svc.base.base.entity.CommonStaff;
+import com.winsea.svc.base.base.entity.CommonStaffRole;
 import com.winsea.svc.base.base.service.*;
 import com.winsea.svc.base.security.config.SecurityProperties;
 import com.winsea.svc.base.security.config.shiro.ShiroRealm;
@@ -26,6 +27,7 @@ import com.winsea.svc.notice.service.INoticeTaskService;
 import com.winsea.svc.notice.service.INoticeUtilService;
 import com.yh.saas.common.support.entity.BaseModel;
 import com.yh.saas.common.support.event.SupportEventBus;
+import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.query.QueryUtils;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.AppServiceException;
@@ -88,6 +90,8 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
     private ICommonStaffService commonStaffService;
     @Autowired
     private ICommonCompanyService commonCompanyService;
+    @Autowired
+    private ICommonStaffRoleService commonStaffRoleService;
 
     @Autowired
     private INoticeBusinessConstantService businessConstantService;
@@ -783,5 +787,14 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         return (Wrapper<NoticeTaskInfo>) noticeUtilService.getCurrentUserNoticeTaskWrapper(wrapper, NoticeTaskInfo.class);
     }
 
+    @Override
+    public String saveRole(CommonStaffRole commonStaffRole){
+        commonStaffRoleService.delete(new EntityWrapper<CommonStaffRole>().eq("staff_id",commonStaffRole.getStaffId())
+        .eq("role_major","0"));
+        commonStaffRole.setId(IdGenerator.generateUUID());
+        commonStaffRoleService.insert(commonStaffRole);
+        return "OK";
+    }
+
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -463,7 +463,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
             taskContent =  staffName + "提交的运输单价等待审核";
         NoticeTaskInfo taskInfo = new NoticeTaskInfo();
         taskInfo.setCompId(commitUserInfo.getCompId());
-        taskInfo.setAcceptType(BaseNotice.AcceptStatus.STAFF);
+        taskInfo.setAcceptType(BaseNotice.AcceptStatus.ROLE);
         taskInfo.setBusinessId(tranProcessInfo.getId());
         taskInfo.setBusinessType("Tran");
         taskInfo.setMessageContent(taskContent);

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/workflow/GoodsPurchaseReceiptReportListener.java

@@ -18,7 +18,7 @@ public class GoodsPurchaseReceiptReportListener extends AbstractWorkflowTaskList
     private IStockPurchaseReceiptReportService stockPurchaseReceiptReportService;
 
     @Override
-    public void handleStatusChanged(String businessKey, String status, String statusEn, boolean processIsEnd) {
+    public void handleStatusChanged(String businessKey, String status, String statusEn, boolean processIsEnd  ) {
         StockPurchaseReceiptReport purchaseReceiptReport = stockPurchaseReceiptReportService.selectById(businessKey);
         if (purchaseReceiptReport == null) {
             return;