1、收藏信息相关接口补充

2、用户信息查询补充角色、权限信息

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderCollection/controller/WorkorderCollectionController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 工单收藏表
  * @Author: jeecg-boot
- * @Date:   2024-11-21
+ * @Date:   2024-12-02
  * @Version: V1.0
  */
 @Api(tags="工单收藏表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderCollection/entity/WorkorderCollection.java

@@ -4,15 +4,12 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import java.util.List;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.modules.workorderStep.entity.WorkorderStep;
 import org.jeecg.modules.workorderTemplate.entity.WorkorderTemplate;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
@@ -25,7 +22,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 工单收藏表
  * @Author: jeecg-boot
- * @Date:   2024-11-21
+ * @Date:   2024-12-02
  * @Version: V1.0
  */
 @Data
@@ -62,6 +59,11 @@ public class WorkorderCollection implements Serializable {
 	@Dict(dictTable = "workorder_user", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "关联用户id")
     private java.lang.String userId;
+	/**关联工单状态id*/
+	@Excel(name = "关联工单状态id", width = 15, dictTable = "workorder_status", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "workorder_status", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联工单状态id")
+    private java.lang.String statusId;
 
     //工单信息
     @TableField(exist = false)

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderCollection/mapper/WorkorderCollectionMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 工单收藏表
  * @Author: jeecg-boot
- * @Date:   2024-11-21
+ * @Date:   2024-12-02
  * @Version: V1.0
  */
 public interface WorkorderCollectionMapper extends BaseMapper<WorkorderCollection> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderCollection/service/IWorkorderCollectionService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 工单收藏表
  * @Author: jeecg-boot
- * @Date:   2024-11-21
+ * @Date:   2024-12-02
  * @Version: V1.0
  */
 public interface IWorkorderCollectionService extends IService<WorkorderCollection> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderCollection/service/impl/WorkorderCollectionServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 工单收藏表
  * @Author: jeecg-boot
- * @Date:   2024-11-21
+ * @Date:   2024-12-02
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderCollection/vue/WorkorderCollectionList.vue

@@ -132,6 +132,11 @@
             align:"center",
             dataIndex: 'userId_dictText'
           },
+          {
+            title:'关联工单状态id',
+            align:"center",
+            dataIndex: 'statusId_dictText'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -168,6 +173,7 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'templateId',text:'关联工单id',dictCode:"workorder_template,task_no,id"})
         fieldList.push({type:'string',value:'userId',text:'关联用户id',dictCode:"workorder_user,name,id"})
+        fieldList.push({type:'string',value:'statusId',text:'关联工单状态id',dictCode:"workorder_status,name,id"})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderCollection/vue/modules/WorkorderCollectionForm.vue

@@ -13,6 +13,11 @@
               <j-dict-select-tag type="list" v-model="model.userId" dictCode="workorder_user,name,id" placeholder="请选择关联用户id" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="关联工单状态id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="statusId">
+              <j-dict-select-tag type="list" v-model="model.statusId" dictCode="workorder_status,name,id" placeholder="请选择关联工单状态id" />
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderCollection/vue3/WorkorderCollection.data.ts

@@ -14,6 +14,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'userId_dictText'
    },
+   {
+    title: '关联工单状态id',
+    align:"center",
+    dataIndex: 'statusId_dictText'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -36,4 +41,12 @@ export const formSchema: FormSchema[] = [
         dictCode:"workorder_user,name,id"
      },
   },
+  {
+    label: '关联工单状态id',
+    field: 'statusId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"workorder_status,name,id"
+     },
+  },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderItemCheck/controller/WorkorderItemCheckController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 检查项目表
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-12-01
  * @Version: V1.0
  */
 @Api(tags="检查项目表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderItemCheck/entity/WorkorderItemCheck.java

@@ -12,11 +12,6 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.modules.workorderGeneralStepfour.entity.WorkorderGeneralStepfour;
-import org.jeecg.modules.workorderGeneralStepone.entity.WorkorderGeneralStepone;
-import org.jeecg.modules.workorderGeneralStepthree.entity.WorkorderGeneralStepthree;
-import org.jeecg.modules.workorderGeneralSteptwo.entity.WorkorderGeneralSteptwo;
-import org.jeecg.modules.workorderParam.entity.WorkorderParam;
 import org.jeecg.modules.workorderParamStepfour.entity.WorkorderParamStepfour;
 import org.jeecg.modules.workorderParamStepone.entity.WorkorderParamStepone;
 import org.jeecg.modules.workorderParamStepthree.entity.WorkorderParamStepthree;
@@ -32,7 +27,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 检查项目表
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-12-01
  * @Version: V1.0
  */
 @Data
@@ -68,6 +63,11 @@ public class WorkorderItemCheck implements Serializable {
 	@Dict(dictTable = "workorder_process", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "关联工序id")
     private java.lang.String processId;
+	/**参数类型(0-字符串 1-图片)*/
+	@Excel(name = "参数类型(0-字符串 1-图片)", width = 15, dicCode = "item_check_type")
+	@Dict(dicCode = "item_check_type")
+    @ApiModelProperty(value = "参数类型(0-字符串 1-图片)")
+    private java.lang.Integer paramType;
 	/**排序字段*/
 	@Excel(name = "排序字段", width = 15)
     @ApiModelProperty(value = "排序字段")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderItemCheck/mapper/WorkorderItemCheckMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 检查项目表
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-12-01
  * @Version: V1.0
  */
 public interface WorkorderItemCheckMapper extends BaseMapper<WorkorderItemCheck> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderItemCheck/service/IWorkorderItemCheckService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 检查项目表
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-12-01
  * @Version: V1.0
  */
 public interface IWorkorderItemCheckService extends IService<WorkorderItemCheck> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderItemCheck/service/impl/WorkorderItemCheckServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 检查项目表
  * @Author: jeecg-boot
- * @Date:   2024-11-22
+ * @Date:   2024-12-01
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderItemCheck/vue/WorkorderItemCheckList.vue

@@ -132,6 +132,11 @@
             align:"center",
             dataIndex: 'processId_dictText'
           },
+          {
+            title:'参数类型(0-字符串 1-图片)',
+            align:"center",
+            dataIndex: 'paramType_dictText'
+          },
           {
             title:'排序字段',
             align:"center",
@@ -173,6 +178,7 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'name',text:'检查项目名称',dictCode:''})
         fieldList.push({type:'string',value:'processId',text:'关联工序id',dictCode:"workorder_process,name,id"})
+        fieldList.push({type:'int',value:'paramType',text:'参数类型(0-字符串 1-图片)',dictCode:'item_check_type'})
         fieldList.push({type:'int',value:'orderNo',text:'排序字段',dictCode:''})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderItemCheck/vue/modules/WorkorderItemCheckForm.vue

@@ -13,6 +13,11 @@
               <j-dict-select-tag type="list" v-model="model.processId" dictCode="workorder_process,name,id" placeholder="请选择关联工序id" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="参数类型(0-字符串 1-图片)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paramType">
+              <j-dict-select-tag type="list" v-model="model.paramType" dictCode="item_check_type" placeholder="请选择参数类型(0-字符串 1-图片)" />
+            </a-form-model-item>
+          </a-col>
           <a-col :span="24">
             <a-form-model-item label="排序字段" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderNo">
               <a-input-number v-model="model.orderNo" placeholder="请输入排序字段" style="width: 100%" />

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderItemCheck/vue3/WorkorderItemCheck.data.ts

@@ -14,6 +14,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'processId_dictText'
    },
+   {
+    title: '参数类型(0-字符串 1-图片)',
+    align:"center",
+    dataIndex: 'paramType_dictText'
+   },
    {
     title: '排序字段',
     align:"center",
@@ -38,6 +43,14 @@ export const formSchema: FormSchema[] = [
         dictCode:"workorder_process,name,id"
      },
   },
+  {
+    label: '参数类型(0-字符串 1-图片)',
+    field: 'paramType',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"item_check_type"
+     },
+  },
   {
     label: '排序字段',
     field: 'orderNo',

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/CollectionController.java

@@ -27,8 +27,8 @@ public class CollectionController {
 
     @ApiOperation(value="收藏信息-我的收藏", notes="收藏信息-我的收藏")
     @RequestMapping(value = "/queryCollectionList", method = {RequestMethod.GET})
-    public Result<?> queryCollectionList(@RequestHeader("X-Access-Token") String userId, PageBean pageBean){
-        return collectionService.queryCollectionList(userId, pageBean);
+    public Result<?> queryCollectionList(@RequestHeader("X-Access-Token") String userId, String statusId, PageBean pageBean){
+        return collectionService.queryCollectionList(userId, statusId, pageBean);
     }
 
     @ApiOperation(value="收藏信息-添加收藏", notes="收藏信息-添加收藏")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java

@@ -44,8 +44,8 @@ public class TemplateController {
     /**************************************工单**********************************************************/
     @ApiOperation(value="工单信息-查询工单列表", notes="工单信息-查询工单列表")
     @RequestMapping(value = "/queryTemplateList", method = {RequestMethod.GET})
-    public Result<?> queryTemplateList(QueryTemplateBean templateBean, PageBean pageBean){
-        return templateService.queryTemplateList(templateBean, pageBean);
+    public Result<?> queryTemplateList(@RequestHeader("X-Access-Token") String userId, QueryTemplateBean templateBean, PageBean pageBean){
+        return templateService.queryTemplateList(userId, templateBean, pageBean);
     }
 
     @ApiOperation(value="工单信息-根据id查询工单详情", notes="工单信息-根据id查询工单详情")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/CollectionService.java

@@ -10,7 +10,7 @@ public interface CollectionService {
      * @param userId
      * @return
      */
-    public Result<?> queryCollectionList(String userId, PageBean pageBean);
+    public Result<?> queryCollectionList(String userId, String statusId, PageBean pageBean);
 
     public Result<?> addCollection(String userId, String templateId);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/TemplateService.java

@@ -23,7 +23,7 @@ public interface TemplateService {
      * @param pageBean
      * @return
      */
-    public Result<?> queryTemplateList(QueryTemplateBean templateBean, PageBean pageBean);
+    public Result<?> queryTemplateList(String userId, QueryTemplateBean templateBean, PageBean pageBean);
 
 
     /**

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java

@@ -37,7 +37,7 @@ public class CollectionServiceImpl implements CollectionService {
 
     //收藏信息-我的收藏
     @Override
-    public Result<?> queryCollectionList(String userId, PageBean pageBean) {
+    public Result<?> queryCollectionList(String userId, String statusId, PageBean pageBean) {
 
         //分页
         Page<WorkorderCollection> page = new Page<WorkorderCollection>(pageBean.getPageNo(), pageBean.getPageSize());
@@ -49,6 +49,10 @@ public class CollectionServiceImpl implements CollectionService {
             //工单状态
             query.eq(WorkorderCollection::getUserId, userId);
         }
+        if(null != statusId){
+            //工单状态
+            query.eq(WorkorderCollection::getStatusId, statusId);
+        }
 
         //获取收藏表信息
         Page<WorkorderCollection> pageList = query.page(page);
@@ -96,17 +100,28 @@ public class CollectionServiceImpl implements CollectionService {
         }
 
         //收藏对象
-        WorkorderCollection collection = new WorkorderCollection();
-        collection.setUserId(userId);
-        collection.setTemplateId(templateId);
+        WorkorderTemplate template = workorderTemplateService
+                .lambdaQuery()
+                .eq(WorkorderTemplate::getId, templateId)
+                .one();
 
-        //执行添加收藏
-        boolean flag = workorderCollectionService.save(collection);
-        if(flag){
-            return Result.OK("收藏成功！");
+        if(null != template){
+            WorkorderCollection collection = new WorkorderCollection();
+            collection.setUserId(userId);
+            collection.setTemplateId(templateId);
+            collection.setStatusId(template.getStatusId());
+
+            //执行添加收藏
+            boolean flag = workorderCollectionService.save(collection);
+            if(flag){
+                return Result.OK("收藏成功！");
+            }else {
+                return Result.error("收藏失败！");
+            }
         }else {
-            return Result.error("收藏失败！");
+            return Result.error("该工单不存在，收藏失败！");
         }
+
     }
 
     //取消收藏

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java

@@ -98,7 +98,7 @@ public class TemplateServiceImpl implements TemplateService {
 
     //工单信息-查询工单列表
     @Override
-    public Result<?> queryTemplateList(QueryTemplateBean templateBean, PageBean pageBean) {
+    public Result<?> queryTemplateList(String userId, QueryTemplateBean templateBean, PageBean pageBean) {
         //分页
         Page<WorkorderTemplate> page = new Page<WorkorderTemplate>(pageBean.getPageNo(), pageBean.getPageSize());
         LambdaQueryChainWrapper<WorkorderTemplate> query = workorderTemplateService
@@ -125,6 +125,22 @@ public class TemplateServiceImpl implements TemplateService {
         //获取账本信息
         Page<WorkorderTemplate> pageList = query.page(page);
 
+        //添加工单是否被收藏标识
+        List<WorkorderCollection> collectionList = workorderCollectionService
+                .lambdaQuery()
+                .eq(WorkorderCollection::getUserId, userId)
+                .list();
+        for (WorkorderTemplate record : pageList.getRecords()) {
+            boolean flag = false;
+            for (WorkorderCollection collection : collectionList) {
+                if(record.getId().equals(collection.getTemplateId())){
+                    flag = true;
+                    break;
+                }
+            }
+            record.setCollectonFlag(flag);
+        }
+
         return Result.OK("工单列表", pageList);
     }
 
@@ -156,8 +172,25 @@ public class TemplateServiceImpl implements TemplateService {
     //工单信息-修改工单
     @Override
     public Result<?> updateTemplate(WorkorderTemplate workorderTemplate) {
+        //修改工单信息
         boolean flag = workorderTemplateService.updateById(workorderTemplate);
-        if(flag){
+
+        //修改收藏表工单状态
+        boolean collectionFlag = false;
+        List<WorkorderCollection> list = workorderCollectionService
+                .lambdaQuery()
+                .eq(WorkorderCollection::getTemplateId, workorderTemplate.getId())
+                .list();
+        if(list.size() != 0){
+            for (WorkorderCollection collection : list) {
+                collection.setStatusId(workorderTemplate.getStatusId());
+            }
+            collectionFlag = workorderCollectionService.updateBatchById(list);
+        }else {
+            collectionFlag = true;
+        }
+
+        if(flag && collectionFlag){
             return Result.OK("修改工单信息成功！");
         }else {
             return Result.error("修改工单信息失败！");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java

@@ -53,12 +53,40 @@ public class UserServiceImpl implements UserService {
     @Override
     public Result<?> queryUserById(String userId) {
         //查询公告信息详情
-        WorkorderUser one = workorderUserService
+        WorkorderUser user = workorderUserService
                 .lambdaQuery()
                 .eq(WorkorderUser::getId, userId)
                 .one();
 
-        return Result.OK("用户信息详情", one);
+        //获取用户角色信息
+        WorkorderRole role = workorderRoleService
+                .lambdaQuery()
+                .eq(WorkorderRole::getId, user.getRoleId())
+                .one();
+        user.setRoleName(role.getName());
+
+        //获取角色权限信息
+        //1、获取权限信息
+        List<WorkorderPermission> permissionList = workorderPermissionService
+                .lambdaQuery()
+                .list();
+        //2、获取角色关联权限
+        List<WorkorderPermissionRole> permissionRoleList = workorderPermissionRoleService
+                .lambdaQuery()
+                .eq(WorkorderPermissionRole::getRoleId, role.getId())
+                .list();
+
+        //添加权限名称
+        for (WorkorderPermissionRole workorderPermissionRole : permissionRoleList) {
+            for (WorkorderPermission permission : permissionList) {
+                if(workorderPermissionRole.getPermissionId().equals(permission.getId())){
+                    workorderPermissionRole.setPermissionName(permission.getName());
+                }
+            }
+        }
+        user.setPermissionRoleList(permissionRoleList);
+
+        return Result.OK("用户信息详情", user);
 
     }