1.门户网首页相关代码2.个人中心相关 3.修改bug

fengjin

2022-09-23 0550953f1d318d0c9162c05fc264fb7d00960ec5

1.门户网首页相关代码2.个人中心相关 3.修改bug

 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java

@@ -305,6 +305,18 @@
        return toAjax(iGuideRepairOrderService.updateConfig(entity));
    }

    /**
     * 获取个人中心工单数据
     * @param sysUser 当前登录人员信息
     * @return
     */
    @ApiOperation("获取个人中心工单数据")
    @GetMapping("/personalCenter")
    @Authorization
    public ResultData selectBySubmitId(@CurrentUser SysUser sysUser){
        return ResultData.success(iGuideRepairOrderService.selectBySubmitId(sysUser.getUserId().toString()));
    }



}

 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrder.java

@@ -149,11 +149,11 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime updateTime;

    @TableField(exist = false)
    @ApiModelProperty(name = "images", value = "图片地址(用逗号分隔)")
    private String images;


    @ApiModelProperty(name = "video", value = "视频地址")
    private String video;

    @TableField(exist = false)
    @ApiModelProperty(name = "guideRepairOrderList", value = "工单处理进度")
@@ -169,6 +169,9 @@
    @ApiModelProperty(name = "evaluateState", value = "评价状态")
    private String evaluateState;

    @ApiModelProperty(name = "serviceState", value = "服务状态(1.已解决 2.未解决)")
    private  Integer serviceState;


    @Override
    public String toString() {

 flower_city/src/main/java/com/dg/core/db/gen/entity/GuideRepairOrderImage.java

@@ -41,6 +41,12 @@
    private String url;


    /**
     * 路径
     */
    @ApiModelProperty("类型1,视频 2.图片")
    private Integer type;



    @Override

 flower_city/src/main/java/com/dg/core/db/gen/entity/TransactionEvent.java

@@ -3,6 +3,7 @@
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 com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -15,6 +16,7 @@

@ApiModel("导办事项管理实体类")
@Data
@TableName("automessage_transaction_event")
public class TransactionEvent implements Serializable
{
    /**

 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideRepairOrderMapper.java

@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.data.repository.query.Param;

import java.util.List;

/**
 * <p>
 * 导办工单管理 Mapper 接口
@@ -33,6 +35,14 @@
    public int updateConfig(GuideRepairOrder order);


    /**
     * 获取个人中心工单数据
     * @param submitUserId
     * @return
     */
    List<GuideRepairOrder> selectBySubmitId(String submitUserId);






 flower_city/src/main/java/com/dg/core/service/IGuideRepairOrderService.java

@@ -3,6 +3,8 @@
import com.dg.core.db.gen.entity.GuideRepairOrder;
import org.springframework.data.repository.query.Param;

import java.util.List;

public interface IGuideRepairOrderService {

    int addOrder(GuideRepairOrder guideRepairOrder);
@@ -24,4 +26,11 @@
     */
    public int updateConfig(GuideRepairOrder order);

    /**
     * 获取个人中心工单数据
     * @param submitUserId
     * @return
     */
    List<GuideRepairOrder> selectBySubmitId(String submitUserId);

}

 flower_city/src/main/java/com/dg/core/service/impl/GuideRepairOrderServiceImpl.java

@@ -14,6 +14,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;

@Service
public class GuideRepairOrderServiceImpl extends ServiceImpl<GuideRepairOrderMapper, GuideRepairOrder>  implements IGuideRepairOrderService {
@@ -41,7 +42,16 @@
            guideRepairOrderImage.setId(Snowflake.getId());
            guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
            guideRepairOrderImage.setUrl(image);
            guideRepairOrderImage.setType(1);
            guideRepairOrderImageMapper.insert(guideRepairOrderImage);
        }
        if (guideRepairOrder.getOrderNum()!=null){
          GuideRepairOrderImage guideRepairOrderImage = new GuideRepairOrderImage();
          guideRepairOrderImage.setId(Snowflake.getId());
          guideRepairOrderImage.setGuideRepairOrderId(guideRepairOrder.getOrderNum());
          guideRepairOrderImage.setUrl(guideRepairOrder.getVideo());
          guideRepairOrderImage.setType(2);
          guideRepairOrderImageMapper.insert(guideRepairOrderImage);
        }
        int ans= baseMapper.insert(guideRepairOrder);
        int i = transactionEventMapper.updateById(transactionEvent);
@@ -61,4 +71,11 @@
    public int updateConfig(GuideRepairOrder order) {
        return baseMapper.updateConfig(order);
    }

    @Override
    public List<GuideRepairOrder> selectBySubmitId(String submitUserId) {
        return baseMapper.selectBySubmitId(submitUserId);
    }


}

 flower_city/src/main/resources/mapper/AgreementMapper.xml

@@ -13,9 +13,9 @@

    <sql id="selectAgreement">
        select id,agreement,
               (select user_name from sys_user where user_id=a.update_user_id)updateUserName,
               (select user_name from automessage_sys_user where user_id=a.update_user_id)updateUserName,
               update_user_id,create_time,
               (select user_name from sys_user where user_id=a.create_user_id)createUserName,
               (select user_name from automessage_sys_user where user_id=a.create_user_id)createUserName,
               create_user_id,agreement_content FROM automessage_agreement a
   </sql>


 flower_city/src/main/resources/mapper/ElseAccessoryMapper.xml

@@ -16,7 +16,7 @@
        SELECT
            id,
            department_id,
            (select organization_name from organization_chart where organization_chart.id=else_accessory.department_id) as departmentName,
            (select organization_name from automessage_organization_chart where automessage_organization_chart.id=automessage_else_accessory.department_id) as departmentName,
            create_time,
            update_time,
            url,

 flower_city/src/main/resources/mapper/GuideRepairOrderMapper.xml

@@ -25,6 +25,9 @@
        <id     property="evaluateContent"      column="evaluate_content"      />
        <id     property="suggest"      column="suggest"      />
        <id     property="evaluateState"      column="evaluate_state"      />
        <id     property="serviceState"      column="service_state"      />
        <id     property="images"      column="images"      />
        <id     property="video"      column="video"      />
    </resultMap>

    <sql id="selectGuideRepairOrderVo">
@@ -50,7 +53,10 @@
            update_time,
            evaluate_content,
            suggest,
            evaluate_state
            evaluate_state,
            service_state,
            video,
            images
        FROM
            automessage_guide_repair_order
    </sql>
@@ -68,6 +74,14 @@
    </select>


    <select id="selectBySubmitId"  resultMap="GuideRepairOrderResult">
        <include refid="selectGuideRepairOrderVo"/>
        where submit_user_id=#{id} and ( state not in (3,5)  or ( state  in (3,5) and create_time>sysdate()-60
        ))
    </select>



    <update id="updateConfig" parameterType="com.dg.core.db.gen.entity.GuideRepairOrder">
        update automessage_guide_repair_order
        <set>
@@ -75,9 +89,13 @@
            <if test="guideDepartmentId != null and guideDepartmentId != '' ">guide_department_id=#{guideDepartmentId},</if>
            <if test="state != null and state != '' ">state=#{state},</if>
            <if test="guideUserPhone != null and guideUserPhone != '' ">guide_user_phone=#{guideUserPhone},</if>
            <if test="evaluateState != null and evaluateState != '' ">evaluate_state=#{evaluateState},</if>
            <if test="evaluateContent != null and evaluateContent != '' ">evaluate_content=#{evaluateContent},</if>
            <if test="suggest != null and suggest != '' ">suggest=#{suggest},</if>
            <if test="serviceState != null  ">service_state=#{serviceState},</if>
            update_time=sysdate()
        </set>
        where  id= #{Id}
        where  id= #{id}
    </update>