Commit 882fa10d authored by Mccoy Z Xia's avatar Mccoy Z Xia

删除了backlog相关类,calendar和calendar config页面及接口调整

parent 37feffd7
......@@ -15,7 +15,7 @@ import javax.annotation.Resource;
* @Date: 2019-07-10 14:29
* @Version: 1.0
**/
@Resource
@RestController
@RequestMapping("api/v1/calendarEvent/")
public class CalendarEventController {
......
......@@ -6,17 +6,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.security.access.annotation.Secured;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import pwc.taxtech.atms.dpo.UserDto;
import pwc.taxtech.atms.dpo.UserOrgDto;
import pwc.taxtech.atms.dpo.UserOrgRoleDto;
import pwc.taxtech.atms.dpo.UserRoleInfo;
import org.springframework.web.bind.annotation.*;
import pwc.taxtech.atms.dpo.*;
import pwc.taxtech.atms.dto.LoginInputDto;
import pwc.taxtech.atms.dto.LoginOutputDto;
import pwc.taxtech.atms.dto.OperationResultDto;
......@@ -264,4 +255,9 @@ public class UserController {
public List<User> getUserByOrg(@PathVariable(name = "roleId",required = false) String orgId,@PathVariable(name = "businessId",required = false) String businessId) {
return userService.getUserByOrg(orgId,businessId);
}
@GetMapping("getAllAvalideUserList")
public List<UserExtDto> getAllAvalideUserList(){
return userService.getAllAvalideUserList();
}
}
......@@ -22,6 +22,7 @@ import pwc.taxtech.atms.constant.PermissionUrl;
import pwc.taxtech.atms.dao.*;
import pwc.taxtech.atms.dpo.RoleInfo;
import pwc.taxtech.atms.dpo.UserDto;
import pwc.taxtech.atms.dpo.UserExtDto;
import pwc.taxtech.atms.dpo.UserRoleInfo;
import pwc.taxtech.atms.dto.*;
import pwc.taxtech.atms.dto.organization.DimensionRoleDto;
......@@ -37,6 +38,7 @@ import pwc.taxtech.atms.exception.ApplicationException;
import pwc.taxtech.atms.exception.ServiceException;
import pwc.taxtech.atms.security.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.util.*;
......@@ -86,6 +88,9 @@ public class UserServiceImpl extends AbstractService {
@Autowired
private BeanUtil beanUtil;
@Resource
private UserExtMapper userExtMapper;
@Value("${api.url}")
private String apiUrl;
......@@ -1072,4 +1077,8 @@ public class UserServiceImpl extends AbstractService {
}
return null;
}
public List<UserExtDto> getAllAvalideUserList() {
return userExtMapper.getAllAvalideUserList();
}
}
package pwc.taxtech.atms.dao;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
import pwc.taxtech.atms.MyMapper;
import pwc.taxtech.atms.dpo.UserExtDto;
import java.util.List;
@Mapper
public interface UserExtMapper extends MyMapper {
@Select("SELECT id, user_name AS userName FROM user WHERE status = 1")
List<UserExtDto> getAllAvalideUserList();
}
package pwc.taxtech.atms.dpo;
/**
* <p> @Description </p>
*
* @Author: Mccoy Z Xia (Xia zhixin)
* @Date: 2019-07-17 15:04
* @Version: 1.0
**/
public class UserExtDto {
private String id;
private String userName;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getUserName() {
return userName;
}
public void setUserName(String userName) {
this.userName = userName;
}
}
package pwc.taxtech.atms.vat.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyVatMapper;
import pwc.taxtech.atms.dpo.BackLogConfigCommonParamDto;
import pwc.taxtech.atms.vat.entity.BacklogConfigCommon;
import pwc.taxtech.atms.vat.entity.BacklogConfigCommonExample;
@Mapper
public interface BacklogConfigCommonMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config_common
*
* @mbg.generated
*/
long countByExample(BacklogConfigCommonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config_common
*
* @mbg.generated
*/
int deleteByExample(BacklogConfigCommonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config_common
*
* @mbg.generated
*/
int deleteByPrimaryKey(Integer id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config_common
*
* @mbg.generated
*/
int insert(BacklogConfigCommon record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config_common
*
* @mbg.generated
*/
int insertSelective(BacklogConfigCommon record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config_common
*
* @mbg.generated
*/
List<BacklogConfigCommon> selectByExampleWithRowbounds(BacklogConfigCommonExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config_common
*
* @mbg.generated
*/
List<BacklogConfigCommon> selectByExample(BacklogConfigCommonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config_common
*
* @mbg.generated
*/
BacklogConfigCommon selectByPrimaryKey(Integer id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config_common
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") BacklogConfigCommon record, @Param("example") BacklogConfigCommonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config_common
*
* @mbg.generated
*/
int updateByExample(@Param("record") BacklogConfigCommon record, @Param("example") BacklogConfigCommonExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config_common
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(BacklogConfigCommon record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config_common
*
* @mbg.generated
*/
int updateByPrimaryKey(BacklogConfigCommon record);
List<BacklogConfigCommon> queryBacklogConfigCommon(BackLogConfigCommonParamDto example);
}
\ No newline at end of file
package pwc.taxtech.atms.vat.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyVatMapper;
import pwc.taxtech.atms.dpo.BackLogConfigParamDto;
import pwc.taxtech.atms.dpo.BacklogConfigDto;
import pwc.taxtech.atms.vat.entity.BacklogConfig;
import pwc.taxtech.atms.vat.entity.BacklogConfigExample;
@Mapper
public interface BacklogConfigMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config
*
* @mbg.generated
*/
long countByExample(BacklogConfigExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config
*
* @mbg.generated
*/
int deleteByExample(BacklogConfigExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config
*
* @mbg.generated
*/
int insert(BacklogConfig record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config
*
* @mbg.generated
*/
int insertSelective(BacklogConfig record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config
*
* @mbg.generated
*/
List<BacklogConfig> selectByExampleWithRowbounds(BacklogConfigExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config
*
* @mbg.generated
*/
List<BacklogConfig> selectByExample(BacklogConfigExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config
*
* @mbg.generated
*/
BacklogConfig selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") BacklogConfig record, @Param("example") BacklogConfigExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config
*
* @mbg.generated
*/
int updateByExample(@Param("record") BacklogConfig record, @Param("example") BacklogConfigExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(BacklogConfig record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_config
*
* @mbg.generated
*/
int updateByPrimaryKey(BacklogConfig record);
List<BacklogConfigDto> queryBacklogConfig(BackLogConfigParamDto record);
int clearGroup(@Param("groupId") Long groupId);
int insertByIncrement(BacklogConfig record);
}
\ No newline at end of file
package pwc.taxtech.atms.vat.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyVatMapper;
import pwc.taxtech.atms.dpo.BackLogDetailParamDto;
import pwc.taxtech.atms.dpo.BacklogCalendarViewDto;
import pwc.taxtech.atms.dpo.BacklogDetailDto;
import pwc.taxtech.atms.vat.entity.BacklogDetail;
import pwc.taxtech.atms.vat.entity.BacklogDetailExample;
@Mapper
public interface BacklogDetailMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_detail
*
* @mbg.generated
*/
long countByExample(BacklogDetailExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_detail
*
* @mbg.generated
*/
int deleteByExample(BacklogDetailExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_detail
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_detail
*
* @mbg.generated
*/
int insert(BacklogDetail record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_detail
*
* @mbg.generated
*/
int insertSelective(BacklogDetail record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_detail
*
* @mbg.generated
*/
List<BacklogDetail> selectByExampleWithRowbounds(BacklogDetailExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_detail
*
* @mbg.generated
*/
List<BacklogDetail> selectByExample(BacklogDetailExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_detail
*
* @mbg.generated
*/
BacklogDetail selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_detail
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") BacklogDetail record, @Param("example") BacklogDetailExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_detail
*
* @mbg.generated
*/
int updateByExample(@Param("record") BacklogDetail record, @Param("example") BacklogDetailExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_detail
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(BacklogDetail record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_detail
*
* @mbg.generated
*/
int updateByPrimaryKey(BacklogDetail record);
List<BacklogDetailDto> queryBacklogDetail(BackLogDetailParamDto record);
int clearGroup(@Param("groupId") Long groupId);
// List<BacklogCalendarViewDto> queryBacklogCalendarView(BackLogDetailParamDto record);
List<BacklogDetailDto> queryBacklogDetailForGroup(BackLogDetailParamDto record);
}
\ No newline at end of file
package pwc.taxtech.atms.vat.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyVatMapper;
import pwc.taxtech.atms.dpo.BackLogGroupParamDto;
import pwc.taxtech.atms.dpo.BacklogGroupDto;
import pwc.taxtech.atms.vat.entity.BacklogGroup;
import pwc.taxtech.atms.vat.entity.BacklogGroupExample;
@Mapper
public interface BacklogGroupMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_group
*
* @mbg.generated
*/
long countByExample(BacklogGroupExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_group
*
* @mbg.generated
*/
int deleteByExample(BacklogGroupExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_group
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_group
*
* @mbg.generated
*/
int insert(BacklogGroup record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_group
*
* @mbg.generated
*/
int insertSelective(BacklogGroup record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_group
*
* @mbg.generated
*/
List<BacklogGroup> selectByExampleWithRowbounds(BacklogGroupExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_group
*
* @mbg.generated
*/
List<BacklogGroup> selectByExample(BacklogGroupExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_group
*
* @mbg.generated
*/
BacklogGroup selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_group
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") BacklogGroup record, @Param("example") BacklogGroupExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_group
*
* @mbg.generated
*/
int updateByExample(@Param("record") BacklogGroup record, @Param("example") BacklogGroupExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_group
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(BacklogGroup record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_group
*
* @mbg.generated
*/
int updateByPrimaryKey(BacklogGroup record);
List<BacklogGroupDto> queryBacklogGroup(BackLogGroupParamDto param);
int insertByIncrement(BacklogGroup record);
List<BacklogGroupDto> queryBacklogGroupDetail(BackLogGroupParamDto param);
}
\ No newline at end of file
package pwc.taxtech.atms.vat.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyVatMapper;
import pwc.taxtech.atms.dpo.BacklogLogDto;
import pwc.taxtech.atms.vat.entity.BacklogLog;
import pwc.taxtech.atms.vat.entity.BacklogLogExample;
@Mapper
public interface BacklogLogMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_log
*
* @mbg.generated
*/
long countByExample(BacklogLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_log
*
* @mbg.generated
*/
int deleteByExample(BacklogLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_log
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_log
*
* @mbg.generated
*/
int insert(BacklogLog record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_log
*
* @mbg.generated
*/
int insertSelective(BacklogLog record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_log
*
* @mbg.generated
*/
List<BacklogLog> selectByExampleWithRowbounds(BacklogLogExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_log
*
* @mbg.generated
*/
List<BacklogLog> selectByExample(BacklogLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_log
*
* @mbg.generated
*/
BacklogLog selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_log
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") BacklogLog record, @Param("example") BacklogLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_log
*
* @mbg.generated
*/
int updateByExample(@Param("record") BacklogLog record, @Param("example") BacklogLogExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_log
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(BacklogLog record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_log
*
* @mbg.generated
*/
int updateByPrimaryKey(BacklogLog record);
List<BacklogLogDto> queryBacklogLog(@Param("detailId") Long detailId,@Param("detailIds") List<Long> detailIds);
}
\ No newline at end of file
package pwc.taxtech.atms.vat.dao;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.session.RowBounds;
import pwc.taxtech.atms.MyVatMapper;
import pwc.taxtech.atms.vat.entity.BacklogType;
import pwc.taxtech.atms.vat.entity.BacklogTypeExample;
@Mapper
public interface BacklogTypeMapper extends MyVatMapper {
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_type
*
* @mbg.generated
*/
long countByExample(BacklogTypeExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_type
*
* @mbg.generated
*/
int deleteByExample(BacklogTypeExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_type
*
* @mbg.generated
*/
int deleteByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_type
*
* @mbg.generated
*/
int insert(BacklogType record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_type
*
* @mbg.generated
*/
int insertSelective(BacklogType record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_type
*
* @mbg.generated
*/
List<BacklogType> selectByExampleWithRowbounds(BacklogTypeExample example, RowBounds rowBounds);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_type
*
* @mbg.generated
*/
List<BacklogType> selectByExample(BacklogTypeExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_type
*
* @mbg.generated
*/
BacklogType selectByPrimaryKey(Long id);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_type
*
* @mbg.generated
*/
int updateByExampleSelective(@Param("record") BacklogType record, @Param("example") BacklogTypeExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_type
*
* @mbg.generated
*/
int updateByExample(@Param("record") BacklogType record, @Param("example") BacklogTypeExample example);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_type
*
* @mbg.generated
*/
int updateByPrimaryKeySelective(BacklogType record);
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table backlog_type
*
* @mbg.generated
*/
int updateByPrimaryKey(BacklogType record);
}
\ No newline at end of file
......@@ -287,6 +287,7 @@
"TheLastDayOfMonth":"月末最后一天",
"ValidDataRequired": "有效日期必选!",
"CompanyRequired": "公司名称必选!",
"TaskNameRequired": "事项名称必填!",
"EventMonthRequired": "事项涉及自然月必选!",
"TaxOptionRequired": "税务事项必选!",
"EventDayRequired": "事项涉及自然日必选!",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment