Merge remote-tracking branch 'origin/master'

src/main/java/com/hz/employmentsite/controller/baseSettings/SiteInfoController.java

@@ -4,12 +4,15 @@ import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
 import com.hz.employmentsite.util.ExcelHelper;
+import com.hz.employmentsite.vo.baseSettings.InstitutionVo;
 import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.hz.employmentsite.services.service.baseSettings.SiteInfoService;
 import com.hz.employmentsite.services.service.AccountService;
 
+import java.util.UUID;
+
 @RestController
 @RequestMapping("/api/siteInfo/")
 public class SiteInfoController {
@@ -35,6 +38,21 @@ public class SiteInfoController {
         return RespGenerstor.success(result);
     }
 
+    @GetMapping("get")
+    public BaseResponse<SiteInfoVo> get(@RequestParam(required = false) String siteID) {
+        SiteInfoVo dataModel = new SiteInfoVo();
+        if (siteID == null || siteID == ""){
+            dataModel.siteID = UUID.randomUUID().toString();
+        }else{
+            dataModel = siteService.get(siteID);
+        }
+        return RespGenerstor.success(dataModel);
+    }
+
+    @PostMapping("save")
+    public BaseResponse<Integer> save(@RequestBody SiteInfoVo data) {
+        return RespGenerstor.success(siteService.save(data,accountService.getLoginUserID()));
+    }
 
 
 

src/main/java/com/hz/employmentsite/controller/baseSettings/UserInfoController.java

@@ -10,6 +10,8 @@ import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.UUID;
+
 @RestController
 @RequestMapping("/api/userInfo/")
 public class UserInfoController {
@@ -33,6 +35,21 @@ public class UserInfoController {
         return RespGenerstor.success(result);
     }
 
+    @GetMapping("get")
+    public BaseResponse<UserInfoVo> get(@RequestParam(required = false) String siteUserID) {
+        UserInfoVo dataModel = new UserInfoVo();
+        if (siteUserID == null || siteUserID == ""){
+            dataModel.siteUserID = UUID.randomUUID().toString();
+        }else{
+            dataModel = userInfoService.get(siteUserID);
+        }
+        return RespGenerstor.success(dataModel);
+    }
+
+    @PostMapping("save")
+    public BaseResponse<Integer> save(@RequestBody UserInfoVo data) {
+        return RespGenerstor.success(userInfoService.save(data,accountService.getLoginUserID()));
+    }
 
 
 

src/main/java/com/hz/employmentsite/controller/taskAndLog/DoWorkController.java

@@ -3,26 +3,47 @@ package com.hz.employmentsite.controller.taskAndLog;
 import com.github.pagehelper.PageInfo;
 import com.hz.employmentsite.filter.exception.BaseResponse;
 import com.hz.employmentsite.filter.exception.RespGenerstor;
+import com.hz.employmentsite.services.service.AccountService;
 import com.hz.employmentsite.services.service.taskAndLog.DoWorkService;
+import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.UUID;
+
 @RestController
-@RequestMapping(value = "/api/taskAndLog/doWork")
+@RequestMapping(value = "/api/doWork")
 public class DoWorkController {
     @Autowired
-    private DoWorkService workLogService;
+    private AccountService accountService;
+
+    @Autowired
+    private DoWorkService doWorkService;
 
     @ResponseBody
     @GetMapping("/getList")
     public BaseResponse getList(@RequestParam("pageIndex") int pageIndex, @RequestParam("pageSize") int pageSize, @RequestParam(required = false) String primaryKey,
                                 @RequestParam(required = false) String userName,@RequestParam(required = false) String workStartDate,  @RequestParam(required = false) String workEndDate,
                                 @RequestParam(required = false) Integer doTypeID, @RequestParam(required = false) String regionCode,@RequestParam(required = false) String streetCode){
-        PageInfo<DoWorkVo> result = workLogService.getList(pageIndex, pageSize,primaryKey, userName, workStartDate,workEndDate,doTypeID,regionCode,streetCode);
+        PageInfo<DoWorkVo> result = doWorkService.getList(pageIndex, pageSize,primaryKey, userName, workStartDate,workEndDate,doTypeID,regionCode,streetCode);
         return RespGenerstor.success(result);
     }
 
 
+    @GetMapping("get")
+    public BaseResponse<DoWorkVo> get(@RequestParam(required = false) String doWorkID) {
+        DoWorkVo dataModel = new DoWorkVo();
+        if (doWorkID == null || doWorkID == ""){
+            dataModel.doWorkID = UUID.randomUUID().toString();
+        }else{
+            dataModel = doWorkService.get(doWorkID);
+        }
+        return RespGenerstor.success(dataModel);
+    }
 
+    @PostMapping("save")
+    public BaseResponse<Integer> save(@RequestBody DoWorkVo data) {
+        return RespGenerstor.success(doWorkService.save(data,accountService.getLoginUserID()));
+    }
 }

src/main/java/com/hz/employmentsite/mapper/PcSiteUserMapper.java

@@ -10,13 +10,21 @@ public interface PcSiteUserMapper {
 
     int deleteByExample(PcSiteUserExample example);
 
+    int deleteByPrimaryKey(String siteUserID);
+
     int insert(PcSiteUser row);
 
     int insertSelective(PcSiteUser row);
 
     List<PcSiteUser> selectByExample(PcSiteUserExample example);
 
+    PcSiteUser selectByPrimaryKey(String siteUserID);
+
     int updateByExampleSelective(@Param("row") PcSiteUser row, @Param("example") PcSiteUserExample example);
 
     int updateByExample(@Param("row") PcSiteUser row, @Param("example") PcSiteUserExample example);
+
+    int updateByPrimaryKeySelective(PcSiteUser row);
+
+    int updateByPrimaryKey(PcSiteUser row);
 }

src/main/java/com/hz/employmentsite/model/PcSiteUser.java

@@ -5,6 +5,8 @@ import java.util.Date;
 public class PcSiteUser {
     private String siteUserID;
 
+    private String siteID;
+
     private String name;
 
     private Integer gender;
@@ -29,6 +31,14 @@ public class PcSiteUser {
         this.siteUserID = siteUserID == null ? null : siteUserID.trim();
     }
 
+    public String getSiteID() {
+        return siteID;
+    }
+
+    public void setSiteID(String siteID) {
+        this.siteID = siteID == null ? null : siteID.trim();
+    }
+
     public String getName() {
         return name;
     }

src/main/java/com/hz/employmentsite/model/PcSiteUserExample.java

@@ -175,6 +175,76 @@ public class PcSiteUserExample {
             return (Criteria) this;
         }
 
+        public Criteria andSiteIDIsNull() {
+            addCriterion("SiteID is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDIsNotNull() {
+            addCriterion("SiteID is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDEqualTo(String value) {
+            addCriterion("SiteID =", value, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDNotEqualTo(String value) {
+            addCriterion("SiteID <>", value, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDGreaterThan(String value) {
+            addCriterion("SiteID >", value, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDGreaterThanOrEqualTo(String value) {
+            addCriterion("SiteID >=", value, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDLessThan(String value) {
+            addCriterion("SiteID <", value, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDLessThanOrEqualTo(String value) {
+            addCriterion("SiteID <=", value, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDLike(String value) {
+            addCriterion("SiteID like", value, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDNotLike(String value) {
+            addCriterion("SiteID not like", value, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDIn(List<String> values) {
+            addCriterion("SiteID in", values, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDNotIn(List<String> values) {
+            addCriterion("SiteID not in", values, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDBetween(String value1, String value2) {
+            addCriterion("SiteID between", value1, value2, "siteID");
+            return (Criteria) this;
+        }
+
+        public Criteria andSiteIDNotBetween(String value1, String value2) {
+            addCriterion("SiteID not between", value1, value2, "siteID");
+            return (Criteria) this;
+        }
+
         public Criteria andNameIsNull() {
             addCriterion("Name is null");
             return (Criteria) this;

src/main/java/com/hz/employmentsite/services/impl/baseSettings/InstitutionImpl.java

@@ -40,11 +40,10 @@ public class InstitutionImpl implements InstitutionService {
 
 
     @Override
-    public InstitutionVo get(String InstitutionID) {
+    public InstitutionVo get(String siteUserID) {
         List<String> ids = new ArrayList<>();
-        ids.add(InstitutionID);
-        String sqlPrimaryKey = stringUtils.ListToInSql(ids);
-        InstitutionVo model = institutionCQuery.getList(sqlPrimaryKey,null,null ,null).stream().findFirst().orElse(null);
+        ids.add(siteUserID);
+        InstitutionVo model = institutionCQuery.getList(stringUtils.ListToInSql(ids),null,null ,null).stream().findFirst().orElse(null);
         return model;
     }
 

src/main/java/com/hz/employmentsite/services/impl/baseSettings/SiteInfoImpl.java

@@ -2,13 +2,17 @@ package com.hz.employmentsite.services.impl.baseSettings;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.mapper.PcSiteMapper;
 import com.hz.employmentsite.mapper.cquery.SiteInfoCQuery;
+import com.hz.employmentsite.model.PcSite;
 import com.hz.employmentsite.services.service.baseSettings.SiteInfoService;
 import com.hz.employmentsite.util.StringUtils;
 import com.hz.employmentsite.vo.baseSettings.SiteInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Service("SiteInfoService")
@@ -20,6 +24,9 @@ public class SiteInfoImpl implements SiteInfoService {
     @Autowired
     private StringUtils stringUtils;
 
+    @Autowired
+    private PcSiteMapper pcSiteMapper;
+
     @Override
     public PageInfo<SiteInfoVo> getList(int pageIndex, int pageSize, String primaryKey, String siteCode, String siteName, String institutionName, String regionCode, String streetCode) {
         PageHelper.startPage(pageIndex, pageSize);
@@ -36,4 +43,57 @@ public class SiteInfoImpl implements SiteInfoService {
         return result;
     }
 
+
+    @Override
+    public SiteInfoVo get(String siteID) {
+        List<String> ids = new ArrayList<>();
+        ids.add(siteID);
+        String sqlPrimaryKey = stringUtils.ListToInSql(ids);
+        SiteInfoVo model = siteInfoCQuery.getList(sqlPrimaryKey,null,null ,null,null,null).stream().findFirst().orElse(null);
+        return model;
+    }
+
+    @Override
+    public Integer save(SiteInfoVo data, String userId) {
+        int result = 0;
+        SiteInfoVo record = get(data.siteID);
+        PcSite dbData = record ==null ? null : pcSiteMapper.selectByPrimaryKey(record.siteID);
+        Boolean isExist = dbData != null;
+        if (!isExist) {
+            //添加
+            dbData = new PcSite();
+            dbData.setSiteID(data.getSiteID());
+            dbData.setSiteCode(data.getSiteCode());
+            dbData.setSiteName(data.getSiteName());
+            dbData.setFzrName(data.getFzrName());
+            dbData.setFzrMobile(data.getFzrMobile());
+            dbData.setSiteX(data.getSiteX());
+            dbData.setSiteY(data.getSiteY());
+            dbData.setDetailAddress(data.getDetailAddress());
+            dbData.setRegionCode(data.getRegionCode());
+            dbData.setStreetCode(data.getStreetCode());
+            dbData.setCreateUserID(userId);
+            dbData.setCreateTime(new Date());
+            result = pcSiteMapper.insert(dbData);
+        } else {
+            //修改
+
+            dbData.setSiteID(data.siteID);
+            dbData.setSiteCode(data.siteCode);
+            dbData.setSiteName(data.siteName);
+            dbData.setFzrName(data.fzrName);
+            dbData.setFzrMobile(data.fzrMobile);
+            dbData.setSiteX(data.siteX);
+            dbData.setSiteY(data.siteY);
+            dbData.setDetailAddress(data.detailAddress);
+            dbData.setRegionCode(data.regionCode);
+            dbData.setStreetCode(data.streetCode);
+            dbData.setModifyUserID(userId);
+            dbData.setModifyTime(new Date());
+            result = pcSiteMapper.updateByPrimaryKey(dbData);
+        }
+        return result;
+    }
+
+
 }

src/main/java/com/hz/employmentsite/services/impl/baseSettings/UserInfoImpl.java

@@ -2,13 +2,17 @@ package com.hz.employmentsite.services.impl.baseSettings;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.mapper.PcSiteUserMapper;
 import com.hz.employmentsite.mapper.cquery.UserInfoCQuery;
+import com.hz.employmentsite.model.PcSiteUser;
 import com.hz.employmentsite.services.service.baseSettings.UserInfoService;
 import com.hz.employmentsite.util.StringUtils;
 import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Service("UserInfoService")
@@ -20,6 +24,8 @@ public class UserInfoImpl implements UserInfoService {
     @Autowired
     private StringUtils stringUtils;
 
+    @Autowired
+    private PcSiteUserMapper pcSiteUserMapper;
     @Override
     public PageInfo<UserInfoVo> getList(int pageIndex, int pageSize, String primaryKey, String userName) {
         PageHelper.startPage(pageIndex, pageSize);
@@ -28,5 +34,46 @@ public class UserInfoImpl implements UserInfoService {
         return result;
     }
 
+    @Override
+    public UserInfoVo get(String siteUserID) {
+        List<String> ids = new ArrayList<>();
+        ids.add(siteUserID);
+        String sqlPrimaryKey = stringUtils.ListToInSql(ids);
+        UserInfoVo model = userInfoCQuery.getList(sqlPrimaryKey,null).stream().findFirst().orElse(null);
+        return model;
+    }
 
+    @Override
+    public Integer save(UserInfoVo data, String userId) {
+        int result = 0;
+        UserInfoVo record = get(data.siteUserID);
+        PcSiteUser dbData = record ==null ? null : pcSiteUserMapper.selectByPrimaryKey(record.siteUserID);
+        Boolean isExist = dbData != null;
+        if (!isExist) {
+            //添加
+            dbData = new PcSiteUser();
+            dbData.setSiteUserID(data.getSiteUserID());
+            dbData.setGender(data.getGender());
+            dbData.setName(data.getName());
+            dbData.setGender(data.getGender());
+            dbData.setRoleID(data.getRoleID());
+            dbData.setMobile(data.getMobile());
+            dbData.setCreateUserID(userId);
+            dbData.setCreateTime(new Date());
+            result = pcSiteUserMapper.insert(dbData);
+        } else {
+            //修改
+
+            dbData.setSiteUserID(data.siteUserID);
+            dbData.setGender(data.gender);
+            dbData.setName(data.name);
+            dbData.setGender(data.gender);
+            dbData.setRoleID(data.roleID);
+            dbData.setMobile(data.mobile);
+            dbData.setUpdateBy(userId);
+            dbData.setUpdateTime(new Date());
+            result = pcSiteUserMapper.updateByPrimaryKey(dbData);
+        }
+        return result;
+    }
 }

src/main/java/com/hz/employmentsite/services/impl/taskAndLog/DoWorkImpl.java

@@ -2,12 +2,19 @@ package com.hz.employmentsite.services.impl.taskAndLog;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.hz.employmentsite.mapper.PcDoworkMapper;
 import com.hz.employmentsite.mapper.cquery.DoWorkCQuery;
+import com.hz.employmentsite.model.PcDowork;
+import com.hz.employmentsite.model.PcSiteUser;
 import com.hz.employmentsite.services.service.taskAndLog.DoWorkService;
+import com.hz.employmentsite.util.StringUtils;
+import com.hz.employmentsite.vo.baseSettings.UserInfoVo;
 import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Service("DoWorkService")
@@ -16,6 +23,12 @@ public class DoWorkImpl implements DoWorkService {
     @Autowired
     private DoWorkCQuery doWorkCQuery;
 
+    @Autowired
+    private StringUtils stringUtils;
+
+    @Autowired
+    private PcDoworkMapper pcDoworkMapper;
+
     @Override
     public PageInfo<DoWorkVo> getList(int pageIndex, int pageSize, String primaryKey, String userName, String workStartDate, String workEndDate, Integer doTypeID, String regionCode, String streetCode) {
             PageHelper.startPage(pageIndex, pageSize);
@@ -24,5 +37,44 @@ public class DoWorkImpl implements DoWorkService {
             return result;
     }
 
+    @Override
+    public DoWorkVo get(String doWorkID) {
+        List<String> ids = new ArrayList<>();
+        ids.add(doWorkID);
+        String sqlPrimaryKey = stringUtils.ListToInSql(ids);
+        DoWorkVo model = doWorkCQuery.getList(sqlPrimaryKey,null,null,null,null,null,null).stream().findFirst().orElse(null);
+        return model;
+    }
+
+    @Override
+    public Integer save(DoWorkVo data, String userId) {
+        int result = 0;
+        DoWorkVo record = get(data.doWorkID);
+        PcDowork dbData = record ==null ? null : pcDoworkMapper.selectByPrimaryKey(record.doWorkID);
+        Boolean isExist = dbData != null;
+        if (!isExist) {
+            //添加
+            dbData = new PcDowork();
+            dbData.setDoTypeID(data.getDoTypeID());
+            dbData.setSiteID(data.getSiteID());
+            dbData.setDoTypeID(data.getDoTypeID());
+            dbData.setDoworkID(data.getDoWorkID());
+            dbData.setUserID(data.getUserID());
+            dbData.setCreateUserID(userId);
+            dbData.setCreateTime(new Date());
+            result = pcDoworkMapper.insert(dbData);
+        } else {
+            //修改
+            dbData.setDoTypeID(data.doTypeID);
+            dbData.setSiteID(data.siteID);
+            dbData.setDoTypeID(data.doTypeID);
+            dbData.setDoworkID(data.doWorkID);
+            dbData.setUserID(data.userID);
+            dbData.setModifyUserID(userId);
+            dbData.setModifyTime(new Date());
+            result = pcDoworkMapper.updateByPrimaryKey(dbData);
+        }
+        return result;
+    }
 
 }

src/main/java/com/hz/employmentsite/services/service/baseSettings/InstitutionService.java

@@ -9,7 +9,7 @@ public interface InstitutionService {
 
     PageInfo<InstitutionVo> getList(int pageIndex, int pageSize, String primaryKey, String companyName, String companyAddress, String dutyUserName);
 
-    InstitutionVo get(String practiceTaskStudentID);
+    InstitutionVo get(String institutionID);
 
     Integer save(InstitutionVo data, String userId);
 

src/main/java/com/hz/employmentsite/services/service/baseSettings/SiteInfoService.java

@@ -9,4 +9,8 @@ public interface SiteInfoService {
     PageInfo<SiteInfoVo> getList(int pageIndex, int pageSize, String primaryKey, String siteCode, String siteName, String institutionName, String regionCode, String streetCode);
 
     PageInfo<SiteInfoVo> getListByInstitutionID(int pageIndex, int pageSize, String institutionID);
+
+    SiteInfoVo get(String siteID);
+
+    Integer save(SiteInfoVo data, String userId);
 }

src/main/java/com/hz/employmentsite/services/service/baseSettings/UserInfoService.java

@@ -8,4 +8,7 @@ public interface UserInfoService {
 
     PageInfo<UserInfoVo> getList(int pageIndex, int pageSize, String primaryKey, String userName);
 
+    UserInfoVo get(String siteUserID);
+
+    Integer save(UserInfoVo data, String userId);
 }

src/main/java/com/hz/employmentsite/services/service/taskAndLog/DoWorkService.java

@@ -6,4 +6,7 @@ import com.hz.employmentsite.vo.taskAndLog.DoWorkVo;
 public interface DoWorkService {
     PageInfo<DoWorkVo> getList(int pageIndex, int pageSize, String primaryKey, String userName, String workStartDate, String workEndDate, Integer doTypeID, String regionCode, String streetCode);
 
+    DoWorkVo get(String doWorkID);
+
+    Integer save(DoWorkVo data, String userId);
 }

src/main/java/com/hz/employmentsite/vo/taskAndLog/DoWorkVo.java

@@ -16,6 +16,8 @@ public class DoWorkVo {
 
     public Integer doTypeID;
 
+    public String logTypeName;
+
     public String workContent;
 
     public String workTime;

src/main/resources/generatorConfig.xml

@@ -91,11 +91,11 @@
         <table schema="" tableName="pc_recommend"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_recruit"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_site"><property name="useActualColumnNames" value="true"/></table>
+        <table schema="" tableName="pc_site_user"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_site_institution"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_stall"><property name="useActualColumnNames" value="true"/></table>
           <table schema="" tableName="area_code"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_dotask_user"><property name="useActualColumnNames" value="true"/></table>
-        <table schema="" tableName="pc_site_user"><property name="useActualColumnNames" value="true"/></table>
 
         <table schema="" tableName="pc_post"><property name="useActualColumnNames" value="true"/></table>
         <table schema="" tableName="pc_post"><property name="useActualColumnNames" value="true"/></table>

src/main/resources/mapping/PcSiteUserMapper.xml

@@ -2,7 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hz.employmentsite.mapper.PcSiteUserMapper">
   <resultMap id="BaseResultMap" type="com.hz.employmentsite.model.PcSiteUser">
-    <result column="SiteUserID" jdbcType="VARCHAR" property="siteUserID" />
+    <id column="SiteUserID" jdbcType="VARCHAR" property="siteUserID" />
+    <result column="SiteID" jdbcType="VARCHAR" property="siteID" />
     <result column="Name" jdbcType="VARCHAR" property="name" />
     <result column="Gender" jdbcType="INTEGER" property="gender" />
     <result column="Mobile" jdbcType="VARCHAR" property="mobile" />
@@ -71,7 +72,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    SiteUserID, Name, Gender, Mobile, RoleID, CreateUserID, CreateTime, UpdateBy, UpdateTime
+    SiteUserID, SiteID, Name, Gender, Mobile, RoleID, CreateUserID, CreateTime, UpdateBy, 
+    UpdateTime
   </sql>
   <select id="selectByExample" parameterType="com.hz.employmentsite.model.PcSiteUserExample" resultMap="BaseResultMap">
     select
@@ -87,6 +89,16 @@
       order by ${orderByClause}
     </if>
   </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from pc_site_user
+    where SiteUserID = #{siteUserID,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from pc_site_user
+    where SiteUserID = #{siteUserID,jdbcType=VARCHAR}
+  </delete>
   <delete id="deleteByExample" parameterType="com.hz.employmentsite.model.PcSiteUserExample">
     delete from pc_site_user
     <if test="_parameter != null">
@@ -94,14 +106,14 @@
     </if>
   </delete>
   <insert id="insert" parameterType="com.hz.employmentsite.model.PcSiteUser">
-    insert into pc_site_user (SiteUserID, Name, Gender, 
-      Mobile, RoleID, CreateUserID, 
-      CreateTime, UpdateBy, UpdateTime
-      )
-    values (#{siteUserID,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{gender,jdbcType=INTEGER}, 
-      #{mobile,jdbcType=VARCHAR}, #{roleID,jdbcType=INTEGER}, #{createUserID,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}
-      )
+    insert into pc_site_user (SiteUserID, SiteID, Name, 
+      Gender, Mobile, RoleID, 
+      CreateUserID, CreateTime, UpdateBy, 
+      UpdateTime)
+    values (#{siteUserID,jdbcType=VARCHAR}, #{siteID,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, 
+      #{gender,jdbcType=INTEGER}, #{mobile,jdbcType=VARCHAR}, #{roleID,jdbcType=INTEGER}, 
+      #{createUserID,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR}, 
+      #{updateTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" parameterType="com.hz.employmentsite.model.PcSiteUser">
     insert into pc_site_user
@@ -109,6 +121,9 @@
       <if test="siteUserID != null">
         SiteUserID,
       </if>
+      <if test="siteID != null">
+        SiteID,
+      </if>
       <if test="name != null">
         Name,
       </if>
@@ -138,6 +153,9 @@
       <if test="siteUserID != null">
         #{siteUserID,jdbcType=VARCHAR},
       </if>
+      <if test="siteID != null">
+        #{siteID,jdbcType=VARCHAR},
+      </if>
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
@@ -176,6 +194,9 @@
       <if test="row.siteUserID != null">
         SiteUserID = #{row.siteUserID,jdbcType=VARCHAR},
       </if>
+      <if test="row.siteID != null">
+        SiteID = #{row.siteID,jdbcType=VARCHAR},
+      </if>
       <if test="row.name != null">
         Name = #{row.name,jdbcType=VARCHAR},
       </if>
@@ -208,6 +229,7 @@
   <update id="updateByExample" parameterType="map">
     update pc_site_user
     set SiteUserID = #{row.siteUserID,jdbcType=VARCHAR},
+      SiteID = #{row.siteID,jdbcType=VARCHAR},
       Name = #{row.name,jdbcType=VARCHAR},
       Gender = #{row.gender,jdbcType=INTEGER},
       Mobile = #{row.mobile,jdbcType=VARCHAR},
@@ -220,4 +242,50 @@
       <include refid="Update_By_Example_Where_Clause" />
     </if>
   </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.hz.employmentsite.model.PcSiteUser">
+    update pc_site_user
+    <set>
+      <if test="siteID != null">
+        SiteID = #{siteID,jdbcType=VARCHAR},
+      </if>
+      <if test="name != null">
+        Name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="gender != null">
+        Gender = #{gender,jdbcType=INTEGER},
+      </if>
+      <if test="mobile != null">
+        Mobile = #{mobile,jdbcType=VARCHAR},
+      </if>
+      <if test="roleID != null">
+        RoleID = #{roleID,jdbcType=INTEGER},
+      </if>
+      <if test="createUserID != null">
+        CreateUserID = #{createUserID,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null">
+        CreateTime = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateBy != null">
+        UpdateBy = #{updateBy,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UpdateTime = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where SiteUserID = #{siteUserID,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.hz.employmentsite.model.PcSiteUser">
+    update pc_site_user
+    set SiteID = #{siteID,jdbcType=VARCHAR},
+      Name = #{name,jdbcType=VARCHAR},
+      Gender = #{gender,jdbcType=INTEGER},
+      Mobile = #{mobile,jdbcType=VARCHAR},
+      RoleID = #{roleID,jdbcType=INTEGER},
+      CreateUserID = #{createUserID,jdbcType=VARCHAR},
+      CreateTime = #{createTime,jdbcType=TIMESTAMP},
+      UpdateBy = #{updateBy,jdbcType=VARCHAR},
+      UpdateTime = #{updateTime,jdbcType=TIMESTAMP}
+    where SiteUserID = #{siteUserID,jdbcType=VARCHAR}
+  </update>
 </mapper>

src/main/resources/mapping/cquery/DoWorkCQuery.xml

@@ -2,11 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.hz.employmentsite.mapper.cquery.DoWorkCQuery">
     <select id="getList" resultType="com.hz.employmentsite.vo.taskAndLog.DoWorkVo">
-        select workLog.*,siteUser.Name as UserName,region.name as RegionName,street.name as StreetName from pc_dowork workLog
+        select workLog.*,siteUser.Name as UserName,region.name as RegionName,street.name as StreetName,dic_logType.name as LogTypeName from pc_dowork workLog
+        left join (select * from sys_dictionary_item where DictionaryCode ='LogType' ) dic_logType   on workLog.doTypeID = dic_logType.Value
         left join area_code region on workLog.RegionCode = region.code
         left join area_code street on workLog.StreetCode = street.code
         left join pc_site site on workLog.SiteID = site.SiteID
-        left join pc_site_user siteUser on workLog.SiteUserID = siteUser.SiteUserID where 1=1
+        left join pc_site_user siteUser on workLog.SiteUserID = siteUser.SiteUserID
+        where 1=1
         <if test="primaryKey!='' and primaryKey!=null">
             and doworkID in (${primaryKey})
         </if>

vue/src/api/baseSettings/siteInfo.ts

@@ -13,5 +13,32 @@ export function getList(params: any) {
     },
   );
 }
+export function get(siteID: string) {
+  return request<object>(
+    {
+      url: 'siteInfo/get',
+      method: 'get',
+      params: {siteID:siteID},
+    },
+    {
+      isNew: true,
+    },
+  );
+}
+
+export function save(data: any) {
+  return request<object>(
+    {
+      url: 'siteInfo/save',
+      method: 'post',
+      data: data,
+    },
+    {
+      isNew: true,
+      successMsg: '提交成功！',
+      errorMsg: '提交失败！'
+    },
+  );
+}
 
 

vue/src/api/baseSettings/userInfo.ts

@@ -13,5 +13,31 @@ export function getList(params: any) {
     },
   );
 }
+export function get(siteUserID: string) {
+  return request<object>(
+    {
+      url: 'userInfo/get',
+      method: 'get',
+      params: {siteUserID:siteUserID},
+    },
+    {
+      isNew: true,
+    },
+  );
+}
 
+export function save(data: any) {
+  return request<object>(
+    {
+      url: 'userInfo/save',
+      method: 'post',
+      data: data,
+    },
+    {
+      isNew: true,
+      successMsg: '提交成功！',
+      errorMsg: '提交失败！'
+    },
+  );
+}
 

vue/src/api/taskAndLog/dowork.ts

@@ -4,7 +4,7 @@ import {request} from "@/utils/request";
 export function getList(params: any) {
   return request<object>(
     {
-      url: "taskAndLog/doWork/getList",
+      url: "doWork/getList",
       method: 'get',
       params: params,
     },
@@ -13,4 +13,30 @@ export function getList(params: any) {
     },
   );
 }
+export function get( doWorkID: string) {
+  return request<object>(
+    {
+      url: 'doWork/get',
+      method: 'get',
+      params: {doWorkID:doWorkID},
+    },
+    {
+      isNew: true,
+    },
+  );
+}
 
+export function save(data: any) {
+  return request<object>(
+    {
+      url: 'doWork/save',
+      method: 'post',
+      data: data,
+    },
+    {
+      isNew: true,
+      successMsg: '提交成功！',
+      errorMsg: '提交失败！'
+    },
+  );
+}

vue/src/views/baseSettings/site/edit.vue

@@ -14,9 +14,9 @@
       <a-divider orientation="left">基础信息管理</a-divider>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="驿站编号" name="SiteID" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.siteID}}</label>
-            <a-input v-model:value="dataModel.siteID" placeholder=""/>
+          <a-form-item label="驿站编号" name="SiteCode" :label-col="{span:7}">
+            <label v-if="isDetail">{{dataModel.siteCode}}</label>
+            <a-input v-model:value="dataModel.siteCode" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="7">
@@ -36,29 +36,15 @@
         <a-col :span="7">
           <a-form-item label="所属县区"  name="RegionCode" :label-col="{span:7}">
             <label v-if="isDetail">{{dataModel.regionCode }}</label>
-            <a-select
-              v-if ="!isDetail"
-              ref="select"
-              v-model:value="dataModel.regionCode"
-              :options="regionList"
-              :field-names="{ label: 'name', value: 'code' }"
-              :allow-clear="true"
-            >
-            </a-select>
+            <a-select v-if ="!isDetail" ref="select" v-model:value="dataModel.regionCode" :options="regionList"
+              :field-names="{ label: 'name', value: 'code' }" :allow-clear="true" @change="changeRegion" > </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="7">
           <a-form-item label="所属街道"  name="StreetCode" :label-col="{span:7}">
             <label v-if="isDetail">{{dataModel.streetCode }}</label>
-            <a-select
-              v-if ="!isDetail"
-              ref="select"
-              v-model:value="dataModel.streetCode"
-              :options="streetList"
-              :field-names="{ label: 'name', value: 'code' }"
-              :allow-clear="true"
-            >
-            </a-select>
+            <a-select  v-if ="!isDetail" ref="select" v-model:value="dataModel.streetCode" :options="streetList"
+              :field-names="{ label: 'name', value: 'code' }" :allow-clear="true" > </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="10">
@@ -76,15 +62,15 @@
           </a-form-item>
         </a-col>
         <a-col :span="7">
-          <a-form-item label="联系电话"  name="Mobile" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.mobile }}</label>
-            <a-input v-model:value="dataModel.mobile" placeholder=""/>
+          <a-form-item label="联系电话"  name="FzrMobile" :label-col="{span:7}">
+            <label v-if="isDetail">{{dataModel.fzrMobile }}</label>
+            <a-input v-model:value="dataModel.fzrMobile" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="10">
           <a-form-item label="驿站坐标"  name="SiteXY" :label-col="{span:10}">
-            <label v-if="isDetail">{{dataModel.siteXY }}</label>
-            <a-input v-model:value="dataModel.siteXY" placeholder=""/>
+            <label v-if="isDetail">{{dataModel.sitePosition}}</label>
+            <a-input v-model:value="dataModel.sitePosition" placeholder=""/>
           </a-form-item>
         </a-col>
       </a-row>
@@ -97,13 +83,13 @@
   </a-modal>
 </template>
 <script lang="ts">
-import {computed, defineComponent, reactive, ref, toRefs} from "vue";
-import {get, save} from "@/api/baseSettings/institution";
+import {defineComponent, reactive, ref, toRefs} from "vue";
+import {get, save} from "@/api/baseSettings/siteInfo";
 import BUploadFile from "@/components/file/uploadFile.vue";
-import {message, TableColumnsType, TableProps} from "ant-design-vue";
-import {getPaginationTotalTitle} from "@/utils/common";
+import {message, SelectProps} from "ant-design-vue";
+import {getRegionCodeList, getStreetCodeList} from "@/api/system/area/index";
 
-interface InstitutionModel {
+interface siteModel {
   dataModel: any;
 }
 export default defineComponent({
@@ -116,39 +102,43 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const formData = reactive<InstitutionModel>({ dataModel:{}});
+    const formData = reactive<siteModel>({ dataModel:{}});
     const visible = ref<boolean>(false);
     const confirmLoading = ref<boolean>(false);
     const title = ref();
     const isAllowCommit = ref<boolean>(false);
     const isDetail = ref<boolean>(false);
-    const pageParams = reactive({
-      pageIndex: 1,
-      pageSize: 20,
-      institutionID:''
-    });
-    const columns: TableColumnsType = [
-      {title: '序号', align: "center",key: 'siteID',customRender: item => `${pageParams.pageSize * (pageParams.pageIndex - 1) + item.index + 1}`},
-      {title: '驿站名称', dataIndex: 'siteName', key: 'siteName', align: "center"},
-      {title: '驿站地址', dataIndex: 'detailAddress', key: 'detailAddress', align: "center"}
-    ];
-    const pagination = computed(() => ({
-      total: formState.total,
-      current: pageParams.pageIndex,
-      pageSize: pageParams.pageSize,
-      showSizeChanger: true,
-      showTotal: total => getPaginationTotalTitle(total)
-    }));
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
       loading: false
     });
 
-    const loadData = (id: string) => {
-      pageParams.institutionID = id;
-      get(pageParams).then((result: any) => {
+    const regionList = ref<SelectProps['options']>();
+    const streetList = ref<SelectProps['options']>();
+
+    const getRegionList = async function(){
+      const regionResult: any = await getRegionCodeList();
+      console.log('regionResult',regionResult);
+      regionList.value = regionResult;
+    }
+
+    const changeRegion = async function(){
+      formData.dataModel.streetCode = '';
+    }
+    const getStreetList = async function(){
+      const streetResult: any = await getStreetCodeList(formData.dataModel.regionCode);
+      console.log('streetResult',streetResult);
+      streetList.value = streetResult;
+    }
+
+    const loadData = (siteID: string) => {
+      get(siteID).then((result: any) => {
         formData.dataModel = result;
+        getStreetList();
+        if (formData.dataModel.siteX !=null && formData.dataModel.siteY != null){
+          formData.dataModel.sitePosition = "X:"+formData.dataModel.siteX+" Y:"+formData.dataModel.siteX;
+        }
         console.log(formData.dataModel);
       });
     }
@@ -160,10 +150,6 @@ export default defineComponent({
       visible.value = true;
     };
 
-    const handleTableChange: TableProps['onChange'] = (pag: { pageSize: number; current: number },) => {
-      pageParams.pageIndex = pag.current;
-      pageParams.pageSize = pag.pageSize;
-    };
 
     const onSelectChange = (selectedRowKeys: any) => {
       formState.selectedRowKeys = selectedRowKeys;
@@ -171,26 +157,11 @@ export default defineComponent({
 
     const validate = ()  =>{
       console.log(formData.dataModel);
-      if (formData.dataModel.companyName==null) {
-        message.error("请输入企业名称!");
-        return;
-      }else if (formData.dataModel.companyAddress==null) {
-        message.error("请输入企业地址!");
-        return;
-      }else if (formData.dataModel.fzrName==null) {
-        message.error("请输入负责人名称!");
-        return;
-      }else if (formData.dataModel.fzrMobile==null) {
-        message.error("请填写负责人电话!");
-        return;
-      }else if (formData.dataModel.frName==null) {
-        message.error("请填写法人姓名!");
-        return;
-      }else if (formData.dataModel.frMobile==null) {
-        message.error("请填写法人电话!");
+      if (formData.dataModel.siteCode==null) {
+        message.error("请输入驿站编号!");
         return;
-      }else if (formData.dataModel.companyCode==null) {
-        message.error("请填写企业机构代码!");
+      }else if (formData.dataModel.detailAddress==null) {
+        message.error("请填写详细地址!");
         return;
       }
       isAllowCommit.value = true;
@@ -216,24 +187,26 @@ export default defineComponent({
 
     return {
       ...toRefs(formData),
-      pageParams,
-      columns,
-      pagination,
       formState,
+      regionList,
+      streetList,
       isAllowCommit,
       isDetail,
       visible,
       title,
       confirmLoading,
       show,
-      handleTableChange,
+      getRegionList,
+      getStreetList,
       onSelectChange,
+      changeRegion,
       handleOk,
       handleCancel,
       validate
     };
   },
   created() {
+    this.getRegionList();
   },
 })
 </script>

vue/src/views/baseSettings/user/edit.vue

@@ -50,12 +50,10 @@
   </a-modal>
 </template>
 <script lang="ts">
-import {computed, defineComponent, reactive, ref, toRefs} from "vue";
-import {get, save} from "@/api/baseSettings/institution";
+import {defineComponent, reactive, ref, toRefs} from "vue";
+import {get, save} from "@/api/baseSettings/userInfo";
 import BUploadFile from "@/components/file/uploadFile.vue";
-/*import dayjs from "dayjs";*/
-import {message, TableColumnsType, TableProps} from "ant-design-vue";
-import {getPaginationTotalTitle} from "@/utils/common";
+import {message} from "ant-design-vue";
 
 interface InstitutionModel {
   dataModel: any;
@@ -76,32 +74,14 @@ export default defineComponent({
     const title = ref();
     const isAllowCommit = ref<boolean>(false);
     const isDetail = ref<boolean>(false);
-    const pageParams = reactive({
-      pageIndex: 1,
-      pageSize: 20,
-      institutionID:''
-    });
-    const columns: TableColumnsType = [
-      {title: '序号', align: "center",key: 'siteID',customRender: item => `${pageParams.pageSize * (pageParams.pageIndex - 1) + item.index + 1}`},
-      {title: '驿站名称', dataIndex: 'siteName', key: 'siteName', align: "center"},
-      {title: '驿站地址', dataIndex: 'detailAddress', key: 'detailAddress', align: "center"}
-    ];
-    const pagination = computed(() => ({
-      total: formState.total,
-      current: pageParams.pageIndex,
-      pageSize: pageParams.pageSize,
-      showSizeChanger: true,
-      showTotal: total => getPaginationTotalTitle(total)
-    }));
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
       loading: false
     });
 
-    const loadData = (id: string) => {
-      pageParams.institutionID = id;
-      get(pageParams).then((result: any) => {
+    const loadData = (siteUserID: string) => {
+      get(siteUserID).then((result: any) => {
         formData.dataModel = result;
         console.log(formData.dataModel);
       });
@@ -114,10 +94,6 @@ export default defineComponent({
       visible.value = true;
     };
 
-    const handleTableChange: TableProps['onChange'] = (pag: { pageSize: number; current: number },) => {
-      pageParams.pageIndex = pag.current;
-      pageParams.pageSize = pag.pageSize;
-    };
 
     const onSelectChange = (selectedRowKeys: any) => {
       formState.selectedRowKeys = selectedRowKeys;
@@ -125,26 +101,11 @@ export default defineComponent({
 
     const validate = ()  =>{
       console.log(formData.dataModel);
-      if (formData.dataModel.companyName==null) {
-        message.error("请输入企业名称!");
-        return;
-      }else if (formData.dataModel.companyAddress==null) {
-        message.error("请输入企业地址!");
-        return;
-      }else if (formData.dataModel.fzrName==null) {
-        message.error("请输入负责人名称!");
-        return;
-      }else if (formData.dataModel.fzrMobile==null) {
-        message.error("请填写负责人电话!");
-        return;
-      }else if (formData.dataModel.frName==null) {
-        message.error("请填写法人姓名!");
-        return;
-      }else if (formData.dataModel.frMobile==null) {
-        message.error("请填写法人电话!");
+      if (formData.dataModel.name==null) {
+        message.error("请输入姓名!");
         return;
-      }else if (formData.dataModel.companyCode==null) {
-        message.error("请填写企业机构代码!");
+      }else if (formData.dataModel.mobile==null) {
+        message.error("请填写联系电话!");
         return;
       }
       isAllowCommit.value = true;
@@ -170,9 +131,6 @@ export default defineComponent({
 
     return {
       ...toRefs(formData),
-      pageParams,
-      columns,
-      pagination,
       formState,
       isAllowCommit,
       isDetail,
@@ -180,7 +138,6 @@ export default defineComponent({
       title,
       confirmLoading,
       show,
-      handleTableChange,
       onSelectChange,
       handleOk,
       handleCancel,

vue/src/views/taskAndLog/dowork/edit.vue

@@ -14,15 +14,15 @@
       <a-divider orientation="left">基础信息管理</a-divider>
       <a-row type="flex">
         <a-col :span="7">
-          <a-form-item label="姓名" name="Name" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.name}}</label>
-            <a-input v-model:value="dataModel.name" placeholder=""/>
+          <a-form-item label="姓名" name="UserName" :label-col="{span:7}">
+            <label v-if="isDetail">{{dataModel.userName}}</label>
+            <a-input v-model:value="dataModel.userName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="7">
-            <a-form-item label="日志类型" name="WorkType" :label-col="{span:7}">
-            <label v-if="isDetail">{{dataModel.doWorkType }}</label>
-            <a-input v-model:value="dataModel.doWorkType" placeholder=""/>
+            <a-form-item label="日志类型" name="LogTypeName" :label-col="{span:7}">
+            <label v-if="isDetail">{{dataModel.logTypeName }}</label>
+            <a-input v-model:value="dataModel.logTypeName" placeholder=""/>
           </a-form-item>
         </a-col>
         <a-col :span="10">
@@ -33,7 +33,7 @@
         </a-col>
       </a-row>
       <a-row>
-        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.remarkDesc"  :disabled="isDetail"
+        <a-textarea :auto-size="{ minRows: 4, maxRows: 10 }"  v-model:value="dataModel.workContent"  :disabled="isDetail"
                     placeholder="完成情况" style="text-align: center;" />
       </a-row>
       <a-divider orientation="left">其他信息</a-divider>
@@ -44,11 +44,10 @@
   </a-modal>
 </template>
 <script lang="ts">
-import {computed, defineComponent, reactive, ref, toRefs} from "vue";
-import {get, save} from "@/api/baseSettings/institution";
+import {defineComponent, reactive, ref, toRefs} from "vue";
+import {get, save} from "@/api/taskAndLog/dowork";
 import BUploadFile from "@/components/file/uploadFile.vue";
-import {message, TableColumnsType, TableProps} from "ant-design-vue";
-import {getPaginationTotalTitle} from "@/utils/common";
+import {message} from "ant-design-vue";
 
 interface InstitutionModel {
   dataModel: any;
@@ -69,32 +68,13 @@ export default defineComponent({
     const title = ref();
     const isAllowCommit = ref<boolean>(false);
     const isDetail = ref<boolean>(false);
-    const pageParams = reactive({
-      pageIndex: 1,
-      pageSize: 20,
-      institutionID:''
-    });
-    const columns: TableColumnsType = [
-      {title: '序号', align: "center",key: 'siteID',customRender: item => `${pageParams.pageSize * (pageParams.pageIndex - 1) + item.index + 1}`},
-      {title: '驿站名称', dataIndex: 'siteName', key: 'siteName', align: "center"},
-      {title: '驿站地址', dataIndex: 'detailAddress', key: 'detailAddress', align: "center"}
-    ];
-    const pagination = computed(() => ({
-      total: formState.total,
-      current: pageParams.pageIndex,
-      pageSize: pageParams.pageSize,
-      showSizeChanger: true,
-      showTotal: total => getPaginationTotalTitle(total)
-    }));
     const formState = reactive({
       total: 0,
       selectedRowKeys: [],
       loading: false
     });
-
-    const loadData = (id: string) => {
-      pageParams.institutionID = id;
-      get(pageParams).then((result: any) => {
+    const loadData = (doWorkID: string) => {
+      get(doWorkID).then((result: any) => {
         formData.dataModel = result;
         console.log(formData.dataModel);
       });
@@ -107,37 +87,14 @@ export default defineComponent({
       visible.value = true;
     };
 
-    const handleTableChange: TableProps['onChange'] = (pag: { pageSize: number; current: number },) => {
-      pageParams.pageIndex = pag.current;
-      pageParams.pageSize = pag.pageSize;
-    };
-
     const onSelectChange = (selectedRowKeys: any) => {
       formState.selectedRowKeys = selectedRowKeys;
     };
 
     const validate = ()  =>{
       console.log(formData.dataModel);
-      if (formData.dataModel.companyName==null) {
-        message.error("请输入企业名称!");
-        return;
-      }else if (formData.dataModel.companyAddress==null) {
-        message.error("请输入企业地址!");
-        return;
-      }else if (formData.dataModel.fzrName==null) {
-        message.error("请输入负责人名称!");
-        return;
-      }else if (formData.dataModel.fzrMobile==null) {
-        message.error("请填写负责人电话!");
-        return;
-      }else if (formData.dataModel.frName==null) {
-        message.error("请填写法人姓名!");
-        return;
-      }else if (formData.dataModel.frMobile==null) {
-        message.error("请填写法人电话!");
-        return;
-      }else if (formData.dataModel.companyCode==null) {
-        message.error("请填写企业机构代码!");
+      if (formData.dataModel.userName==null) {
+        message.error("请输入姓名!");
         return;
       }
       isAllowCommit.value = true;
@@ -163,9 +120,6 @@ export default defineComponent({
 
     return {
       ...toRefs(formData),
-      pageParams,
-      columns,
-      pagination,
       formState,
       isAllowCommit,
       isDetail,
@@ -173,7 +127,6 @@ export default defineComponent({
       title,
       confirmLoading,
       show,
-      handleTableChange,
       onSelectChange,
       handleOk,
       handleCancel,

vue/src/views/taskAndLog/dowork/index.vue

@@ -13,8 +13,11 @@
           </a-form-item>
         </a-col>
         <a-col  :span="6">
-          <a-form-item label="日志类型" :label-col="{span:6}" name="DoType">
-            <a-input v-model:value="searchParams.doTypeID" placeholder=""  />
+          <a-form-item label="日志类型" :label-col="{span:6}" name="logType">
+            <a-select  ref="select"
+              v-model:value="searchParams.doTypeID" :options="logTypeList"
+              :field-names="{ label: 'name', value: 'value' }" @change="onSearch">
+            </a-select>
           </a-form-item>
         </a-col>
         <a-col :span="5" style="text-align: right">
@@ -82,8 +85,7 @@
 <script lang="ts">
 import {reactive, ref, computed, defineComponent} from 'vue';
 import {DownOutlined, UpOutlined} from '@ant-design/icons-vue';
-import type {FormInstance,SelectProps} from 'ant-design-vue';
-import type {TableColumnsType, TableProps} from 'ant-design-vue';
+import type {FormInstance,SelectProps,TableColumnsType, TableProps} from 'ant-design-vue';
 import {getList} from '@/api/taskAndLog/dowork';
 import {getRegionCodeList,getStreetCodeList} from '@/api/system/area/index';
 import DoWorkEditForm from "@/views/taskAndLog/dowork/edit.vue";
@@ -91,6 +93,7 @@ import BExportExcel from "@/components/basic/excel/exportExcel/exportExcel.vue";
 import {getPaginationTotalTitle} from "@/utils/common";
 import {message} from "ant-design-vue";
 import dayjs from 'dayjs';
+import {get} from "@/api/common";
 export default defineComponent({
   name: 'doTaskList',
   components: { DownOutlined, UpOutlined, BExportExcel,DoWorkEditForm},
@@ -126,7 +129,7 @@ export default defineComponent({
           return item.record.workTime==null?"": (dayjs(item.record.workTime).format('YYYY-MM-DD'))
         },
       },
-      {title: '日志类型', dataIndex: 'doTypeID', key: 'doTypeID', align: "center"},
+      {title: '日志类型', dataIndex: 'logTypeName', key: 'logTypeName', align: "center"},
       {title: '工作情况', dataIndex: 'workContent', key: 'workContent', align: "center"},
       {title: '所属县区', dataIndex: 'regionName', key: 'regionName', align: "center"},
       {title: '所属街道', dataIndex: 'streetName', key: 'streetName', align: "center"},
@@ -142,9 +145,14 @@ export default defineComponent({
 
     const regionList = ref<SelectProps['options']>();
     const streetList = ref<SelectProps['options']>();
+    const logTypeList = ref<SelectProps['options']>();
     const dataList = ref([]);
     const doWorkEditModelRef = ref();
 
+    get('system/dictionary/getDictionaryItemByCodeList',{code:'LogType'}).then(data=>{
+      logTypeList.value=data;
+    });
+
     const getRegionList = async function(){
       const regionResult: any = await getRegionCodeList();
       console.log('regionResult',regionResult);
@@ -211,6 +219,7 @@ export default defineComponent({
     };
 
     return {
+      logTypeList,
       regionList,
       streetList,
       formRef,